diff --git a/app.js b/app.js
index 834624c479..40867cc606 100755
--- a/app.js
+++ b/app.js
@@ -132,9 +132,9 @@
          */
         ghost.app().get(/^\/logout\/?$/, admin.logout);
         ghost.app().get('/ghost/login/', admin.login);
-        ghost.app().get('/ghost/register/', admin.register);
+        ghost.app().get('/ghost/signup/', admin.signup);
         ghost.app().post('/ghost/login/', admin.auth);
-        ghost.app().post('/ghost/register/', admin.doRegister);
+        ghost.app().post('/ghost/signup/', admin.doRegister);
         ghost.app().get('/ghost/editor/:id', auth, admin.editor);
         ghost.app().get('/ghost/editor', auth, admin.editor);
         ghost.app().get('/ghost/content', auth, admin.content);
@@ -162,4 +162,4 @@
         });
 
     }, errors.logAndThrowError);
-}());
\ No newline at end of file
+}());
diff --git a/core/admin/controllers/index.js b/core/admin/controllers/index.js
index a6d0b66183..db38ec9ef5 100755
--- a/core/admin/controllers/index.js
+++ b/core/admin/controllers/index.js
@@ -75,8 +75,8 @@
                 res.redirect('/ghost/login/');
             });
         },
-        'register': function (req, res) {
-            res.render('register', {
+        'signup': function (req, res) {
+            res.render('signup', {
                 bodyClass: 'ghost-login',
                 hideNavbar: true,
                 adminNav: setSelected(adminNavbar, 'login')
@@ -95,7 +95,7 @@
                     res.redirect('/ghost/login/');
                 }, function (error) {
                     req.flash('error', error.message);
-                    res.redirect('/ghost/register/');
+                    res.redirect('/ghost/signup/');
                 });
             } else {
                 req.flash('error', "The password is too short. Have at least 6 characters in there");
@@ -191,4 +191,4 @@
     };
 
     module.exports = adminControllers;
-}());
\ No newline at end of file
+}());
diff --git a/core/admin/views/login.hbs b/core/admin/views/login.hbs
index 4b594ae960..76826af733 100644
--- a/core/admin/views/login.hbs
+++ b/core/admin/views/login.hbs
@@ -9,7 +9,7 @@
         </div>
         <button class="button-save" type="submit">Log in</button>
         <section class="meta">
-            <a class="forgotten-password" href="#">Forgotten password?</a> &bull; <a href="/ghost/register/">Register new user</a>
+            <a class="forgotten-password" href="#">Forgotten password?</a> &bull; <a href="/ghost/signup/">Register new user</a>
         </section>
     </form>
-</section>
\ No newline at end of file
+</section>
diff --git a/core/admin/views/register.hbs b/core/admin/views/signup.hbs
similarity index 90%
rename from core/admin/views/register.hbs
rename to core/admin/views/signup.hbs
index 7966539464..2c11f313cc 100755
--- a/core/admin/views/register.hbs
+++ b/core/admin/views/signup.hbs
@@ -1,5 +1,5 @@
 {{!< default}}
-<section class="login-box">
+<section class="login-box js-login-container">
     <form id="register" method="post">
         <div class="email-wrap">
             <input class="email_address" type="text" placeholder="Email Address" name="email_address">
@@ -12,4 +12,4 @@
             <a href="/ghost/login/">Log in</a>
         </section>
     </form>
-</section>
\ No newline at end of file
+</section>