diff --git a/app/assets/javascripts/discourse/templates/modal/login.hbs b/app/assets/javascripts/discourse/templates/modal/login.hbs
index 81b3fb611df..4d4062d6114 100644
--- a/app/assets/javascripts/discourse/templates/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/login.hbs
@@ -1,8 +1,8 @@
 {{#login-modal screenX=lastX screenY=lastY loginName=loginName loginPassword=loginPassword action="login"}}
-  {{#d-modal-body title="login.title" class="login-modal"}}
-    {{login-buttons action="externalLogin"}}
-    {{#if canLoginLocal}}
-      <form id='login-form' method='post'>
+  <form id='login-form' method='post'>
+    {{#d-modal-body title="login.title" class="login-modal"}}
+      {{login-buttons action="externalLogin"}}
+      {{#if canLoginLocal}}
         <div>
           <table>
             <tr>
@@ -32,32 +32,30 @@
             </tr>
           </table>
         </div>
-      </form>
-    {{/if}}
-    {{authMessage}}
-    <div id='login-alert' class={{alertClass}}>{{alert}}</div>
-  {{/d-modal-body}}
-
-  <div class="modal-footer">
-    {{#if canLoginLocal}}
-      <button 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>
       {{/if}}
-    {{/if}}
+      {{authMessage}}
+      <div id='login-alert' class={{alertClass}}>{{alert}}</div>
+    {{/d-modal-body}}
 
-    {{#if authenticate}}
-      &nbsp; {{i18n 'login.authenticating'}}
-    {{/if}}
+    <div class="modal-footer">
+      {{#if canLoginLocal}}
+        <button class="btn btn-large btn-primary" type="submit" disabled={{loginDisabled}} {{action "login"}}>
+            {{d-icon "unlock"}} &nbsp;{{loginButtonText}}
+        </button>
 
-    {{conditional-loading-spinner condition=showSpinner size="small"}}
-  </div>
+        {{#if showSignupLink}}
+          &nbsp;
+          <button class="btn btn-large" id="new-account-link" {{action "createAccount"}}>
+            {{i18n 'create_account.title'}}
+          </button>
+        {{/if}}
+      {{/if}}
+
+      {{#if authenticate}}
+        &nbsp; {{i18n 'login.authenticating'}}
+      {{/if}}
+
+      {{conditional-loading-spinner condition=showSpinner size="small"}}
+    </div>
+  </form>
 {{/login-modal}}