diff --git a/src/app/layout/account-switcher.component.html b/src/app/layout/account-switcher.component.html
index b5b6f9f1..07039583 100644
--- a/src/app/layout/account-switcher.component.html
+++ b/src/app/layout/account-switcher.component.html
@@ -1,5 +1,5 @@
 <a class="account-switcher" (click)="toggle()" cdkOverlayOrigin #trigger="cdkOverlayOrigin">
-    <app-avatar [data]="activeAccountEmail" size="25" [circle]="true" [fontSize]="14" *ngIf="activeAccountEmail != null"></app-avatar>
+    <app-avatar [data]="activeAccountEmail" size="25" [circle]="true" [fontSize]="14" [dynamic]="true" *ngIf="activeAccountEmail != null"></app-avatar>
     <span>{{activeAccountEmail}}</span>
     <i class="fa" aria-hidden="true" [ngClass]="{'fa-chevron-down': !isOpen, 'fa-chevron-up': isOpen}"></i>
 </a>
diff --git a/src/app/layout/account-switcher.component.ts b/src/app/layout/account-switcher.component.ts
index 59e41a7f..7533c446 100644
--- a/src/app/layout/account-switcher.component.ts
+++ b/src/app/layout/account-switcher.component.ts
@@ -37,8 +37,10 @@ export class AccountSwitcherComponent implements OnInit {
         private messagingService: MessagingService) {}
 
     async ngOnInit(): Promise<void> {
-        this.stateService.accounts.subscribe(accounts => this.accounts = accounts);
-        this.activeAccountEmail = await this.stateService.getEmail();
+        this.stateService.accounts.subscribe(async accounts => {
+            this.accounts = accounts
+            this.activeAccountEmail = await this.stateService.getEmail();
+        });
     }
 
     toggle() {