diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/header.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/shared/header.component.html
index bf31adfd1d..1648c02510 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/header.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/header.component.html
@@ -33,7 +33,7 @@
             [bitMenuTriggerFor]="accountMenu"
             class="tw-border-0 tw-bg-transparent tw-p-0"
           >
-            <bit-avatar [id]="account.userId" [text]="account.name || account.email"></bit-avatar>
+            <bit-avatar [id]="account.userId" [text]="account | userName"></bit-avatar>
           </button>
 
           <bit-menu #accountMenu>
@@ -42,14 +42,11 @@
                 class="tw-flex tw-items-center tw-py-1 tw-px-4 tw-leading-tight tw-text-info"
                 appStopProp
               >
-                <bit-avatar
-                  [text]="account.name || account.email"
-                  [id]="account.userId"
-                ></bit-avatar>
+                <bit-avatar [text]="account | userName" [id]="account.userId"></bit-avatar>
                 <div class="tw-ml-2 tw-block tw-overflow-hidden tw-whitespace-nowrap">
                   <span>{{ "loggedInAs" | i18n }}</span>
                   <small class="tw-block tw-overflow-hidden tw-whitespace-nowrap tw-text-muted">
-                    {{ account.name }}
+                    {{ account | userName }}
                   </small>
                 </div>
               </div>
diff --git a/libs/angular/src/pipes/user-name.pipe.ts b/libs/angular/src/pipes/user-name.pipe.ts
index 22c214e41e..88b088a7e2 100644
--- a/libs/angular/src/pipes/user-name.pipe.ts
+++ b/libs/angular/src/pipes/user-name.pipe.ts
@@ -2,7 +2,7 @@ import { Pipe, PipeTransform } from "@angular/core";
 
 interface User {
   name?: string;
-  email: string;
+  email?: string;
 }
 
 @Pipe({
@@ -14,6 +14,10 @@ export class UserNamePipe implements PipeTransform {
       return null;
     }
 
+    if (user.name == null && user.email == null) {
+      return null;
+    }
+
     return user.name == null || user.name.trim() === "" ? user.email : user.name;
   }
 }