diff --git a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
index 36bf1bdd66c..c98f8badd66 100644
--- a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
@@ -51,8 +51,7 @@
         {{/second-factor-form}}
       </form>
     {{/if}}
-    {{authMessage}}
-    <div id='login-alert' class={{alertClass}}>{{alert}}</div>
+  
   {{/d-modal-body}}
 
   <div class="modal-footer">
@@ -74,4 +73,6 @@
       {{/if}}
     {{/if}}
   </div>
+  <div class="auth-message">{{authMessage}}</div>
+  <div id='login-alert' class={{alertClass}}>{{alert}}</div>
 {{/login-modal}}
diff --git a/app/assets/javascripts/discourse/templates/modal/login.hbs b/app/assets/javascripts/discourse/templates/modal/login.hbs
index 745d9015457..fe2ec0f575d 100644
--- a/app/assets/javascripts/discourse/templates/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/login.hbs
@@ -33,9 +33,7 @@
         {{/second-factor-form}}
       </form>
     {{/if}}
-    {{authMessage}}
-    <div id='login-alert' class={{alertClass}}>{{alert}}</div>
-    
+ 
     {{#if showLoginButtons}}
       {{login-buttons
         canLoginLocalWithEmail=canLoginLocalWithEmail
@@ -66,4 +64,7 @@
 
     {{conditional-loading-spinner condition=showSpinner size="small"}}
   </div>
+
+  <div class="auth-message">{{authMessage}}</div>
+  <div id='login-alert' class={{alertClass}}>{{alert}}</div>
 {{/login-modal}}
diff --git a/app/assets/stylesheets/common/base/login.scss b/app/assets/stylesheets/common/base/login.scss
index 634be86822c..d266776929b 100644
--- a/app/assets/stylesheets/common/base/login.scss
+++ b/app/assets/stylesheets/common/base/login.scss
@@ -46,6 +46,11 @@ $input-width: 220px;
       width: 100%;
     }
   }
+  .modal-footer {
+    .inline-spinner {
+      display: inline-flex;
+    }
+  }
 }
 
 .create-account {
@@ -138,6 +143,10 @@ $input-width: 220px;
   }
 }
 
+.auth-message {
+  padding: 0 15px 15px 15px
+}
+
 .modal tr.instructions {
   display: flex;
   flex-direction: column;