diff --git a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
index aacaa22bc4..d156ca66dd 100644
--- a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
@@ -1,54 +1,59 @@
-{{#d-modal-body title="login.title" class="login-modal"}}
-  {{login-buttons action="externalLogin"}}
-  {{#if canLoginLocal}}
-    <form id='login-form' method='post'>
-      <div>
-        <table>
-          <tr>
-            <td>
-              <label for='login-account-name'>{{i18n 'login.username'}}&nbsp;</label>
-            </td>
-            <td>
-              {{text-field value=loginName type="email" placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off"}}
-            </td>
-          </tr>
-          <tr>
-            <td>
-                <label for='login-account-password'>{{i18n 'login.password'}}&nbsp;</label>
-            </td>
-            <td>
-                {{text-field value=loginPassword type="password" id="login-account-password" maxlength="200"}} &nbsp;
-            </td>
-          </tr>
-          <tr>
-            <td></td>
-            <td>
-              <a id="forgot-password-link" {{action "showForgotPassword"}}>{{i18n 'forgot_password.action'}}</a>
-            </td>
-          </tr>
-        </table>
-      </div>
-    </form>
-  {{/if}}
-  {{authMessage}}
-  <div id='login-alert' class={{alertClass}}>{{alert}}</div>
-{{/d-modal-body}}
+{{#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'>
+        <div>
+          <table>
+            <tr>
+              <td>
+                <label for='login-account-name'>{{i18n 'login.username'}}&nbsp;</label>
+              </td>
+              <td>
+                {{text-field value=loginName type="email" placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off"}}
+              </td>
+            </tr>
+            <tr>
+              <td>
+                  <label for='login-account-password'>{{i18n 'login.password'}}&nbsp;</label>
+              </td>
+              <td>
+                  {{text-field value=loginPassword type="password" id="login-account-password" maxlength="200"}} &nbsp;
+              </td>
+            </tr>
+            <tr>
+              <td></td>
+              <td>
+                <a id="forgot-password-link" {{action "showForgotPassword"}}>{{i18n 'forgot_password.action'}}</a>
+              </td>
+            </tr>
+          </table>
+        </div>
 
-<div class="modal-footer">
-  {{#if authenticate}}
-    {{i18n 'login.authenticating'}}
-  {{/if}}
-  {{#if canLoginLocal}}
-    <button class='btn btn-large btn-primary'
-      disabled={{loginDisabled}}
-      {{action "login"}}>
-        <i class="fa fa-unlock"></i>&nbsp;{{loginButtonText}}
-    </button>
 
-    {{#if showSignupLink}}
-      <button class="btn btn-large" id="new-account-link" {{action "showCreateAccount"}}>
-        {{i18n 'create_account.title'}}
-      </button>
+      </form>
     {{/if}}
-  {{/if}}
-</div>
+    {{authMessage}}
+    <div id='login-alert' class={{alertClass}}>{{alert}}</div>
+  {{/d-modal-body}}
+
+  <div class="modal-footer">
+    {{#if authenticate}}
+      {{i18n 'login.authenticating'}}
+    {{/if}}
+
+    {{#if canLoginLocal}}
+      <button class='btn btn-large btn-primary'
+        disabled={{loginDisabled}}
+        {{action "login"}}>
+          <i class="fa fa-unlock"></i>&nbsp;{{loginButtonText}}
+      </button>
+
+      {{#if showSignupLink}}
+        <button class="btn btn-large" id="new-account-link" {{action "showCreateAccount"}}>
+          {{i18n 'create_account.title'}}
+        </button>
+      {{/if}}
+    {{/if}}
+  </div>
+{{/login-modal}}