diff --git a/src/views/account.html b/src/views/account.html
index 593c11636..d9f521280 100644
--- a/src/views/account.html
+++ b/src/views/account.html
@@ -179,23 +179,33 @@
                   <table width="100%">
                       <tr>
                           <td class="text-muted" style="vertical-align: top;">Username</td>
-                          <td class="text-right" style="vertical-align: top;">{{ user.username }} &nbsp;&nbsp;&nbsp;</td>
+                          <td class="text-right" style="vertical-align: top;">
+                            {{ user.username }} &nbsp;&nbsp;&nbsp;
+                          </td>
                       </tr>
                       <tr>
                           <td class="text-muted" style="vertical-align: top;">Display name</td>
-                          <td class="text-right" style="vertical-align: top; white-space: nowrap;">{{ user.displayName }} <a href="" ng-click="displayNameChange.show()"><i class="fa fa-pencil text-small"></i></a></td>
+                          <td class="text-right" style="vertical-align: top; white-space: nowrap;">
+                            {{ user.displayName }} <a href="" ng-click="displayNameChange.show()"><i class="fa fa-pencil text-small"></i></a>
+                          </td>
                       </tr>
                       <tr>
                           <td class="text-muted" style="vertical-align: top;">Primary email</td>
-                          <td class="text-right" style="vertical-align: top; white-space: nowrap;">{{ user.email }} <a href="" ng-click="emailchange.show()"><i class="fa fa-pencil text-small"></i></a></td>
+                          <td class="text-right" style="vertical-align: top; white-space: nowrap;">
+                            {{ user.email }} <a href="" ng-click="emailchange.show()"><i class="fa fa-pencil text-small"></i></a>
+                          </td>
                       </tr>
                       <tr>
                           <td class="text-muted" style="vertical-align: top;">Password recovery email</td>
-                          <td class="text-right" style="vertical-align: top; white-space: nowrap;">{{ user.fallbackEmail }} <a href="" ng-click="fallbackEmailChange.show()"><i class="fa fa-pencil text-small"></i></a></td>
+                          <td class="text-right" style="vertical-align: top; white-space: nowrap;">
+                            {{ user.fallbackEmail }} <a href="" ng-click="fallbackEmailChange.show()"><i class="fa fa-pencil text-small"></i></a>
+                          </td>
                       </tr>
                       <tr>
                           <td class="text-muted" style="vertical-align: top;">Two-Factor Authentication</td>
-                          <td class="text-right" style="vertical-align: top; white-space: nowrap;">not enabled  <a href="" ng-click="twoFactorAuthentication.show()"><i class="fa fa-pencil text-small"></i></a></td>
+                          <td class="text-right" style="vertical-align: top; white-space: nowrap;">
+                            <span ng-hide="user.twoFactorAuthenticationEnabled">not</span> enabled <a href="" ng-click="twoFactorAuthentication.show()"><i class="fa fa-pencil text-small"></i></a>
+                          </td>
                       </tr>
                       <tr>
                           <td class="text-right" colspan="2" style="vertical-align: top;">