diff --git a/frontend/src/components/Layout.tsx b/frontend/src/components/Layout.tsx
index 3b212035..6b405cfc 100644
--- a/frontend/src/components/Layout.tsx
+++ b/frontend/src/components/Layout.tsx
@@ -172,7 +172,7 @@ export default function Layout({ children }: LayoutProps) {
className="flex items-center space-x-2 text-sm text-gray-700 hover:text-gray-900 focus:outline-none"
>
{user.name}
+{user.name || user.full_name || user.username}
@{user.username}
- {user.role} + {user.role || (user.is_superuser ? 'Admin' : 'User')}@{user.username}
- {user.role} + {user.role || (user.is_superuser ? 'Admin' : 'User')}