-<div i18n class="account-title">Danger zone</div>
-<my-account-danger-zone [user]="user"></my-account-danger-zone>
+ <div class="col-12 col-lg-8 col-xl-9">
+ <my-account-change-password></my-account-change-password>
+ </div>
+</div>
+
+<div class="row mt-5" *ngIf="user.pluginAuth === null"> <!-- two factor auth grid -->
+ <div class="col-12 col-lg-4 col-xl-3">
+ <h2 i18n class="account-title">Two-factor authentication</h2>
+ </div>
+
+ <div class="col-12 col-lg-8 col-xl-9">
+ <my-account-two-factor-button [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-two-factor-button>
+ </div>
+</div>
+
+<div class="row mt-5" *ngIf="user.pluginAuth === null"> <!-- email grid -->
+ <div class="col-12 col-lg-4 col-xl-3">
+ <h2 i18n class="account-title">EMAIL</h2>
+ </div>
+
+ <div class="col-12 col-lg-8 col-xl-9">
+ <my-account-change-email></my-account-change-email>
+ </div>
+</div>
+
+<div class="row mt-5"> <!-- danger zone grid -->
+ <div class="col-12 col-lg-4 col-xl-3">
+ <h2 i18n class="account-title account-title-danger">DANGER ZONE</h2>
+ </div>
+
+ <div class="col-12 col-lg-8 col-xl-9">
+ <my-account-danger-zone [user]="user"></my-account-danger-zone>
+ </div>
+</div>