diff --git a/app/assets/javascripts/discourse/templates/modal/login.hbs b/app/assets/javascripts/discourse/templates/modal/login.hbs
index 81b3fb611df..9b47c129588 100644
--- a/app/assets/javascripts/discourse/templates/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/login.hbs
@@ -6,24 +6,14 @@
         <div>
           <table>
             <tr>
-              <td>
-                <label for='login-account-name'>{{i18n 'login.username'}}&nbsp;</label>
-              </td>
-              <td>
-                {{text-field value=loginName placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off" autofocus="autofocus"}}
-              </td>
+              <td><label for='login-account-name'>{{i18n 'login.username'}}</label></td>
+              <td>{{text-field value=loginName placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off" autofocus="autofocus"}}</td>
               <td></td>
             </tr>
             <tr>
-              <td>
-                  <label for='login-account-password'>{{i18n 'login.password'}}&nbsp;</label>
-              </td>
-              <td>
-                  {{password-field value=loginPassword type="password" id="login-account-password" maxlength="200" capsLockOn=capsLockOn}} &nbsp;
-              </td>
-              <td>
-                <a id="forgot-password-link" {{action "forgotPassword"}}>{{i18n 'forgot_password.action'}}</a>
-              </td>
+              <td><label for='login-account-password'>{{i18n 'login.password'}}</label></td>
+              <td>{{password-field value=loginPassword type="password" id="login-account-password" maxlength="200" capsLockOn=capsLockOn}}</td>
+              <td><a id="forgot-password-link" {{action "forgotPassword"}}>{{i18n 'forgot_password.action'}}</a></td>
             </tr>
             <tr>
               <td></td>
@@ -40,14 +30,11 @@
 
   <div class="modal-footer">
     {{#if canLoginLocal}}
-      <button class="btn btn-large btn-primary"
-        disabled={{loginDisabled}}
-        {{action "login"}}>
-          {{d-icon "unlock"}} &nbsp;{{loginButtonText}}
+      <button form="login-form" type="submit" class="btn btn-large btn-primary" disabled={{loginDisabled}} {{action "login"}}>
+        {{d-icon "unlock"}}&nbsp;{{loginButtonText}}
       </button>
 
       {{#if showSignupLink}}
-        &nbsp;
         <button class="btn btn-large" id="new-account-link" {{action "createAccount"}}>
           {{i18n 'create_account.title'}}
         </button>
@@ -55,7 +42,7 @@
     {{/if}}
 
     {{#if authenticate}}
-      &nbsp; {{i18n 'login.authenticating'}}
+      &nbsp;{{i18n 'login.authenticating'}}
     {{/if}}
 
     {{conditional-loading-spinner condition=showSpinner size="small"}}
diff --git a/app/assets/stylesheets/desktop/login.scss b/app/assets/stylesheets/desktop/login.scss
index 23c933180f4..3e7e61efcc4 100644
--- a/app/assets/stylesheets/desktop/login.scss
+++ b/app/assets/stylesheets/desktop/login.scss
@@ -16,6 +16,9 @@
   a {
     color: dark-light-choose($primary-high, $secondary-low);
   }
+  td {
+    padding-right: 5px;
+  }
 }
 
 // Create account