diff --git a/src/frontend/src/features/settings/components/SettingsDialog.tsx b/src/frontend/src/features/settings/components/SettingsDialog.tsx
index 4251617e..ed11fde2 100644
--- a/src/frontend/src/features/settings/components/SettingsDialog.tsx
+++ b/src/frontend/src/features/settings/components/SettingsDialog.tsx
@@ -18,7 +18,7 @@ export const SettingsDialog = (props: SettingsDialogProps) => {
           <P>
             <Trans
               i18nKey="settings:account.currentlyLoggedAs"
-              values={{ user: user?.email }}
+              values={{ user: user?.full_name || user?.email }}
               components={[<Badge />]}
             />
           </P>
diff --git a/src/frontend/src/features/settings/components/tabs/AccountTab.tsx b/src/frontend/src/features/settings/components/tabs/AccountTab.tsx
index a8055746..1b58ca66 100644
--- a/src/frontend/src/features/settings/components/tabs/AccountTab.tsx
+++ b/src/frontend/src/features/settings/components/tabs/AccountTab.tsx
@@ -48,7 +48,7 @@ export const AccountTab = ({ id, onOpenChange }: AccountTabProps) => {
           <P>
             <Trans
               i18nKey="settings:account.currentlyLoggedAs"
-              values={{ user: user?.email }}
+              values={{ user: user?.full_name || user?.email }}
               components={[<Badge />]}
             />
           </P>
diff --git a/src/frontend/src/layout/Header.tsx b/src/frontend/src/layout/Header.tsx
index a037c9e5..19270705 100644
--- a/src/frontend/src/layout/Header.tsx
+++ b/src/frontend/src/layout/Header.tsx
@@ -76,7 +76,7 @@ export const Header = () => {
                   tooltip={t('loggedInUserTooltip')}
                   tooltipType="delayed"
                 >
-                  {user.email}
+                  {user?.full_name || user?.email}
                 </Button>
                 <MenuList
                   items={[{ value: 'logout', label: t('logout') }]}