Resolve preferences not setting correct focus (#1336)

src/app/accounts/settings.component.html

@@ -2,16 +2,17 @@
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="modal-body form">
-        <ng-container *ngIf="currentUserEmail != null">
         <div class="box">
           <label class="settingsTitle">{{ "settingsTitle" | i18n: currentUserEmail }} </label>
           <div class="box-content box-content-padded">
             <h2>
               <button
+                id="app-settings"
                 type="button"
                 class="box-header-expandable"
                 (click)="showSecurity = !showSecurity"
                 [attr.aria-expanded]="showSecurity"
+                appAutofocus
               >
                 {{ "security" | i18n }}
                 <i
@@ -179,7 +180,6 @@
             </ng-container>
           </div>
         </div>
-        </ng-container>
         <div class="box">
           <div class="box-content box-content-padded">
             <h2>