diff --git a/src/atlasViewer/atlasViewer.component.ts b/src/atlasViewer/atlasViewer.component.ts
index 82dfd13665bda5129da783a3a326588474ddc327..861aae4b718480d9afca1d856ef5d53eef153664 100644
--- a/src/atlasViewer/atlasViewer.component.ts
+++ b/src/atlasViewer/atlasViewer.component.ts
@@ -94,9 +94,7 @@ export class AtlasViewer implements OnDestroy, OnInit, AfterViewInit {
 
   public sidePanelOpen$: Observable<boolean>
 
-  get toggleMessage(){
-    return this.constantsService.toggleMessage
-  }
+  public toggleMessage = this.constantsService.toggleMessage
 
   constructor(
     private store: Store<ViewerStateInterface>,
diff --git a/src/ui/signinBanner/signinBanner.template.html b/src/ui/signinBanner/signinBanner.template.html
index 22489e4044c5c7036b64b1052e7752750aa1f874..ec4762e487f914e1ec0dfc4b320f393ce449d90b 100644
--- a/src/ui/signinBanner/signinBanner.template.html
+++ b/src/ui/signinBanner/signinBanner.template.html
@@ -9,10 +9,13 @@
       mat-icon-button
       [matMenuTriggerFor]="dropdownMenu"
       color="primary">
-      <i *ngIf="!(user$ | async) as user; else userInitialTempl" class="fas fa-user"></i>
-      <ng-template #userInitialTempl>
+      <ng-template [ngIf]="user$ | async" [ngIfElse]="notLoggedInTmpl" let-user="ngIf">
         {{ (user && user.name || 'Unnamed User').slice(0,1) }}
       </ng-template>
+      
+      <ng-template #notLoggedInTmpl>
+        <i class="fas fa-user"></i>
+      </ng-template>
     </button>
   </div>
 </div>