diff --git a/app/assets/javascripts/discourse/templates/preferences-email.hbs b/app/assets/javascripts/discourse/templates/preferences-email.hbs
index 9adfc3bf581..19a5b128c2a 100644
--- a/app/assets/javascripts/discourse/templates/preferences-email.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-email.hbs
@@ -1,4 +1,4 @@
-<section class='user-right user-preferences'>
+<section class='user-preferences'>
   <form class="form-horizontal">
 
     <div class="control-group">
@@ -9,20 +9,22 @@
 
     {{#if success}}
       <div class="control-group">
-        <div class="instructions">
-          <p>
-            {{#if model.staff}}
-              {{i18n 'user.change_email.success_staff'}}
-            {{else}}
-              {{i18n 'user.change_email.success'}}
-            {{/if}}
-          </p>
+        <div class="controls">
+          <div class="instructions">
+            <p>
+              {{#if model.staff}}
+                {{i18n 'user.change_email.success_staff'}}
+              {{else}}
+                {{i18n 'user.change_email.success'}}
+              {{/if}}
+            </p>
+          </div>
         </div>
       </div>
     {{else}}
       {{#if error}}
         <div class="control-group">
-          <div class="instructions">
+          <div class="controls">
             <div class='alert alert-error'>{{errorMessage}}</div>
           </div>
         </div>
@@ -34,12 +36,14 @@
           {{text-field value=newEmail id="change-email" classNames="input-xxlarge" autofocus="autofocus"}}
           {{input-tip validation=emailValidation}}
         </div>
-        <div class='instructions'>
-          {{#if taken}}
-            {{i18n 'user.change_email.taken'}}
-          {{else}}
-            {{i18n 'user.email.instructions'}}
-          {{/if}}
+        <div class="controls">
+          <div class='instructions'>
+            {{#if taken}}
+              {{i18n 'user.change_email.taken'}}
+            {{else}}
+              {{i18n 'user.email.instructions'}}
+            {{/if}}
+          </div>
         </div>
       </div>
 
diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor-backup.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor-backup.hbs
index a81f2c2b9c8..8b49faa123c 100644
--- a/app/assets/javascripts/discourse/templates/preferences-second-factor-backup.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor-backup.hbs
@@ -1,61 +1,74 @@
-<section class="user-content user-preferences second-factor-backup-preferences">
+<section class="user-preferences second-factor-backup-preferences">
   <form class="form-horizontal">
-    <h2>{{i18n "user.second_factor_backup.title"}}</h2>
 
-    {{#if successMessage}}
-      <div class="alert alert-success">
-        {{successMessage}}
+    <div class="control-group">
+      <div class="controls">
+        <h3>{{i18n "user.second_factor_backup.title"}}</h3>
       </div>
-    {{/if}}
+      <div class="controls">
+        {{#if successMessage}}
+          <div class="alert alert-success">
+            {{successMessage}}
+          </div>
+        {{/if}}
 
-    {{#if errorMessage}}
-      <div class="alert alert-error">
-        {{errorMessage}}
-      </div>
-    {{/if}}
-
-    <div class="second-factor-form">
-      {{second-factor-input
-        value=secondFactorToken
-        maxlength=6
-        inputId="second-factor-token"}}
-
-      <div class="actions">
-          {{d-button
-            action="generateSecondFactorCodes"
-            class="btn btn-primary"
-            disabled=isDisabledGenerateBackupCodeBtn
-            label=generateBackupCodeBtnLabel}}
-        {{#if backupEnabled}}
-          {{d-button
-            action="disableSecondFactorBackup"
-            class="btn btn-danger"
-            disabled=isDisabledDisableBackupCodeBtn
-            label="user.second_factor_backup.disable"}}
+        {{#if errorMessage}}
+          <div class="alert alert-error">
+            {{errorMessage}}
+          </div>
         {{/if}}
       </div>
     </div>
 
-    <div class="instructions">
-      {{i18n "user.second_factor.disable_description"}}
+    <label class='control-label'>{{i18n 'user.second_factor.label'}}</label>
+    <div class="control-group">
+      <div class="controls">
+        {{second-factor-input
+          value=secondFactorToken
+          maxlength=6
+          inputId="second-factor-token"}}
+
+        <div class='instructions'>
+          {{i18n "user.second_factor.disable_description"}}
+        </div>
+      </div>
     </div>
 
-    {{#conditional-loading-section isLoading=loading}}
-      {{#if backupCodes}}
-        <h3>{{i18n "user.second_factor_backup.codes.title"}}</h3>
+    <div class="control-group">
+      <div class="controls">
+        <div class="actions">
+            {{d-button
+              action="generateSecondFactorCodes"
+              class="btn btn-primary"
+              disabled=isDisabledGenerateBackupCodeBtn
+              label=generateBackupCodeBtnLabel}}
+          {{#if backupEnabled}}
+            {{d-button
+              action="disableSecondFactorBackup"
+              class="btn btn-danger"
+              disabled=isDisabledDisableBackupCodeBtn
+              label="user.second_factor_backup.disable"}}
+          {{/if}}
+        </div>
 
-        <p>
-          {{i18n "user.second_factor_backup.codes.description"}}
-        </p>
+        {{#conditional-loading-section isLoading=loading}}
+          {{#if backupCodes}}
+            <h3>{{i18n "user.second_factor_backup.codes.title"}}</h3>
 
-        {{backup-codes
-          copyBackupCode=(action "copyBackupCode")
-          backupCodes=backupCodes}}
-      {{/if}}
-    {{/conditional-loading-section}}
+            <p>
+              {{i18n "user.second_factor_backup.codes.description"}}
+            </p>
 
-    {{#link-to "preferences.account" model.username}}
-      {{i18n "go_back"}}
-    {{/link-to}}
+            {{backup-codes
+              copyBackupCode=(action "copyBackupCode")
+              backupCodes=backupCodes}}
+
+            {{#link-to "preferences.account" model.username}}
+              {{i18n "go_back"}}
+            {{/link-to}}
+          {{/if}}
+        {{/conditional-loading-section}}
+      </div>
+    </div>
   </form>
 </section>
diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
index 6621b7e2a7a..c425d6bf7f7 100644
--- a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
@@ -1,5 +1,6 @@
-<section class='user-content user-preferences'>
+<section class='user-preferences'>
   <form class="form-horizontal">
+
     <div class="control-group">
       <div class="controls">
         <h3>{{i18n 'user.second_factor.title'}}</h3>
@@ -8,7 +9,7 @@
 
     {{#if errorMessage}}
       <div class="control-group">
-        <div class="instructions">
+        <div class="controls">
           <div class='alert alert-error'>{{errorMessage}}</div>
         </div>
       </div>
@@ -22,7 +23,7 @@
           {{second-factor-input value=secondFactorToken inputId='second-factor-token'}}
         </div>
 
-        <div class='instructions'>
+        <div class='instructions controls'>
           {{i18n 'user.second_factor.disable_description'}}
         </div>
       </div>
@@ -97,7 +98,7 @@
                 autofocus="autofocus"}}
           </div>
 
-          <div class='instructions'>
+          <div class='instructions controls'>
             {{i18n 'user.second_factor.confirm_password_description'}}
           </div>
         </div>
diff --git a/app/assets/javascripts/discourse/templates/preferences-username.hbs b/app/assets/javascripts/discourse/templates/preferences-username.hbs
index fc68eccedc8..c0ab8faee8f 100644
--- a/app/assets/javascripts/discourse/templates/preferences-username.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-username.hbs
@@ -1,4 +1,4 @@
-<section class='user-content'>
+<section class='user-preferences'>
   <form class="form-horizontal">
 
     <div class="control-group">
@@ -14,10 +14,10 @@
       </div>
       <div class='instructions controls'>
         <p>
-        {{#if taken}}
-          {{i18n 'user.change_username.taken'}}
-        {{/if}}
-        <span>{{errorMessage}}</span>
+          {{#if taken}}
+            {{i18n 'user.change_username.taken'}}
+          {{/if}}
+          <span>{{errorMessage}}</span>
         </p>
       </div>
     </div>
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index 13438d40596..6170668509c 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -563,11 +563,6 @@
       margin-right: 10px;
     }
 
-    .second-factor-form {
-      display: flex;
-      align-items: center;
-    }
-
     .form-horizontal .instructions {
       margin-left: 0;
     }
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index fb988b512e6..e423ee58c4d 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -292,10 +292,6 @@
     margin-top: 0;
   }
 
-  .form-horizontal .instructions {
-    margin-left: 8px;
-  }
-
   .pref-mailing-list-mode .controls {
     select {
       width: 400px;
diff --git a/test/javascripts/acceptance/preferences-test.js.es6 b/test/javascripts/acceptance/preferences-test.js.es6
index a6e33e1b3d6..b70b13a061f 100644
--- a/test/javascripts/acceptance/preferences-test.js.es6
+++ b/test/javascripts/acceptance/preferences-test.js.es6
@@ -125,7 +125,7 @@ QUnit.test("second factor", assert => {
   });
 
   fillIn("#password", "secrets");
-  click(".user-content .btn-primary");
+  click(".user-preferences .btn-primary");
 
   andThen(() => {
     assert.ok(exists("#test-qr"), "shows qr code");
@@ -156,7 +156,7 @@ QUnit.test("second factor backup", assert => {
   });
 
   fillIn("#second-factor-token", "111111");
-  click(".second-factor-form .btn-primary");
+  click(".user-preferences .btn-primary");
 
   andThen(() => {
     assert.ok(exists(".backup-codes-area"), "shows backup codes");