diff --git a/src/app/accounts/two-factor.component.html b/src/app/accounts/two-factor.component.html
index b7f4725d35..94892bb37b 100644
--- a/src/app/accounts/two-factor.component.html
+++ b/src/app/accounts/two-factor.component.html
@@ -29,7 +29,7 @@
                     </ng-container>
                     <ng-container *ngIf="selectedProviderType === providerType.U2f">
                         <p class="text-center" *ngIf="!u2fReady">
-                            <i class="fa fa-spinner fa-spin"></i>
+                            <i class="fa fa-spinner fa-spin text-muted"></i>
                         </p>
                         <ng-container *ngIf="u2fReady">
                             <p class="text-center">{{'insertU2f' | i18n}}</p>
@@ -42,6 +42,7 @@
                             <iframe id="duo_iframe"></iframe>
                         </div>
                     </ng-container>
+                    <i class="fa fa-spinner text-muted fa-spin pull-right" *ngIf="form.loading && selectedProviderType === providerType.U2f"></i>
                     <div class="form-check" *ngIf="selectedProviderType != null">
                         <input id="remember" type="checkbox" name="Remember" class="form-check-input" [(ngModel)]="remember">
                         <label for="remember" class="form-check-label">{{'rememberMe' | i18n}}</label>
@@ -71,3 +72,4 @@
     </div>
 </form>
 <ng-template #twoFactorOptions></ng-template>
+<iframe id="u2f_iframe" hidden></iframe>