diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index 67ac3aa2932..7921b2a2452 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -90,7 +90,6 @@
           {{/if}}
 
           </form>
-          <div class='disclaimer'>{{{disclaimerHtml}}}</div>
         </div>
       {{/if}}
     {{/d-modal-body}}
@@ -103,6 +102,8 @@
             {{i18n 'log_in'}}
           </button>
         {{/conditional-loading-spinner}}
+
+      <div class='disclaimer'>{{{disclaimerHtml}}}</div>
       </div>
     {{/if}}
   {{/unless}}
diff --git a/app/assets/stylesheets/common/base/login.scss b/app/assets/stylesheets/common/base/login.scss
index 5061ed5a4a7..b24e1ccc5cd 100644
--- a/app/assets/stylesheets/common/base/login.scss
+++ b/app/assets/stylesheets/common/base/login.scss
@@ -29,6 +29,7 @@ $input-width: 220px;
 
   .disclaimer {
     font-size: 0.9em;
+    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
   }
 
   .user-field.confirm {
diff --git a/app/assets/stylesheets/desktop/login.scss b/app/assets/stylesheets/desktop/login.scss
index 1bf2a7988ae..69be797a69f 100644
--- a/app/assets/stylesheets/desktop/login.scss
+++ b/app/assets/stylesheets/desktop/login.scss
@@ -53,4 +53,8 @@
     margin-bottom: 12px;
   }
 
+  .disclaimer {
+    margin-top: 15px;
+  }
+
 }