diff --git a/src/frontend/src/components/nav/SettingsHeader.tsx b/src/frontend/src/components/nav/SettingsHeader.tsx
index a3e93423d5..e5f776bd70 100644
--- a/src/frontend/src/components/nav/SettingsHeader.tsx
+++ b/src/frontend/src/components/nav/SettingsHeader.tsx
@@ -30,7 +30,7 @@ export function SettingsHeader({
         {shorthand && <Text c="dimmed">({shorthand})</Text>}
       </Group>
       <Group>
-        <Text c="dimmed">{subtitle}</Text>
+        {subtitle ? <Text c="dimmed">{subtitle}</Text> : null}
         {switch_text && switch_link && switch_condition && (
           <Anchor component={Link} to={switch_link}>
             <IconSwitch size={14} />
diff --git a/src/frontend/src/pages/Index/Settings/UserSettings.tsx b/src/frontend/src/pages/Index/Settings/UserSettings.tsx
index 6be2f53ad2..437091ac83 100644
--- a/src/frontend/src/pages/Index/Settings/UserSettings.tsx
+++ b/src/frontend/src/pages/Index/Settings/UserSettings.tsx
@@ -148,7 +148,11 @@ export default function UserSettings() {
     <Stack gap="xs">
       <SettingsHeader
         title={t`Account Settings`}
-        subtitle={`${user?.first_name} ${user?.last_name}`}
+        subtitle={
+          user?.first_name && user?.last_name
+            ? `${user?.first_name} ${user?.last_name}`
+            : null
+        }
         shorthand={user?.username || ''}
         switch_link="/settings/system"
         switch_text={<Trans>Switch to System Setting</Trans>}