diff --git a/common/locales/en/settings.json b/common/locales/en/settings.json
index d4ac07344f..17a8b21fb8 100644
--- a/common/locales/en/settings.json
+++ b/common/locales/en/settings.json
@@ -82,6 +82,7 @@
     "emailChange2": "admin@habitrpg.com",
     "emailChange3": " including both your old and new email address as well as your User ID.",
     "username": "Login Name",
+    "usernameOrEmail": "Login Name or Email",
     "email": "Email",
     "registeredWithFb": "Registered with Facebook",
     "loginNameDescription1": "This is what you use to login to HabitRPG. Go to ",
diff --git a/test/e2e/e2e.js b/test/e2e/e2e.js
index a3a62674a7..a4b3db75cb 100644
--- a/test/e2e/e2e.js
+++ b/test/e2e/e2e.js
@@ -34,7 +34,7 @@ describe('front page', function() {
     browser.sleep(1000);
     element(by.model('loginUsername')).sendKeys('username');
     element(by.model('loginPassword')).sendKeys('pass');
-    var login = element(by.css("#login-tab input[value='Login']"));
+    var login = element(by.css("#loginForm input[value='Login']"));
     login.click();
     var alertDialog = browser.switchTo().alert();
     expect(alertDialog.getText()).toMatch("Uh-oh - your username or password is incorrect.\n- Make sure your username or email is typed correctly.\n- You may have signed up with Facebook, not email. Double-check by trying Facebook login.\n- If you forgot your password, click \"Forgot Password\".");
diff --git a/website/public/js/controllers/authCtrl.js b/website/public/js/controllers/authCtrl.js
index 89be71c6af..ce49fdcfc6 100644
--- a/website/public/js/controllers/authCtrl.js
+++ b/website/public/js/controllers/authCtrl.js
@@ -64,8 +64,8 @@ angular.module('habitrpg')
 
       $scope.auth = function() {
         var data = {
-          username: $scope.loginUsername || $('#login-tab input[name="username"]').val(),
-          password: $scope.loginPassword || $('#login-tab input[name="password"]').val()
+          username: $scope.loginUsername || $('#loginForm input[name="username"]').val(),
+          password: $scope.loginPassword || $('#loginForm input[name="password"]').val()
         };
         $http.post(ApiUrl.get() + "/api/v2/user/auth/local", data)
           .success(function(data, status, headers, config) {
diff --git a/website/views/static/login-modal.jade b/website/views/static/login-modal.jade
index 401e82e191..b60f1bafe5 100644
--- a/website/views/static/login-modal.jade
+++ b/website/views/static/login-modal.jade
@@ -14,17 +14,13 @@ script(id='modals/login.html', type='text/ng-template')
     hr
     tabset(justified='true')
       tab(heading=env.t('login'))
-        form#login-tab(ng-submit='auth()', method='POST')
+        form#loginForm(ng-submit='auth()', method='POST', name='loginForm')
           .form-group
-            input.form-control(type='text', ng-model='loginUsername', placeholder=env.t('username')+' or Email', name='username', spellcheck='false', required)
+            input.form-control(type='text', ng-model='loginUsername', placeholder=env.t('usernameOrEmail'), name='username', spellcheck='false', required)
           .form-group
             input.form-control(type='password', ng-model='loginPassword', placeholder=env.t('password'), name='password', required)
-            //-.control-group
-              label.checkbox
-                input(type='checkbox', ng-click='useUUID = !useUUID')
-                =env.t('useUUID')
           .form-group
-            input.btn.btn-primary(type='submit', value=env.t('login'))
+            input.btn.btn-block.btn-lg.btn-primary(type='submit', ng-disabled='loginForm.$invalid', value=env.t('login'))
 
           small=env.t('passMan')
           br
@@ -69,4 +65,4 @@ script(id='modals/login.html', type='text/ng-template')
               a(href='/static/privacy' target='_blank')=env.t('privacy')
               | .
           .form-group
-            input.btn.btn-primary(type='submit', ng-disabled='registrationForm.$invalid || registrationInProgress', value=env.t('register'))
+            input.btn.btn-block.btn-lg.btn-primary(type='submit', ng-disabled='registrationForm.$invalid || registrationInProgress', value=env.t('register'))