diff --git a/backend/src/routes/auth.ts b/backend/src/routes/auth.ts
index b71a301..9d7ac76 100644
--- a/backend/src/routes/auth.ts
+++ b/backend/src/routes/auth.ts
@@ -69,6 +69,7 @@ router.post('/register', async (req: Request, res: Response) => {
       user: {
         id: user.id,
         email: user.email,
+        name: user.name || null,
       },
     });
   } catch (error) {
@@ -107,6 +108,7 @@ router.post('/login', async (req: Request, res: Response) => {
       user: {
         id: user.id,
         email: user.email,
+        name: user.name || null,
       },
     });
   } catch (error) {
diff --git a/frontend/src/components/Layout.tsx b/frontend/src/components/Layout.tsx
index 202ba64..dee983f 100644
--- a/frontend/src/components/Layout.tsx
+++ b/frontend/src/components/Layout.tsx
@@ -262,9 +262,9 @@ export default function Layout({ children }: LayoutProps) {
                   onClick={() => setIsDropdownOpen(!isDropdownOpen)}
                 >
                   <span className="user-dropdown-avatar">
-                    {user.email.charAt(0).toUpperCase()}
+                    {(user.name || user.email).charAt(0).toUpperCase()}
                   </span>
-                  <span className="user-dropdown-email">{user.email}</span>
+                  <span className="user-dropdown-email">{user.name || user.email}</span>
                   <svg
                     className="user-dropdown-arrow"
                     width="12"
diff --git a/frontend/src/context/AuthContext.tsx b/frontend/src/context/AuthContext.tsx
index 3115759..8847e05 100644
--- a/frontend/src/context/AuthContext.tsx
+++ b/frontend/src/context/AuthContext.tsx
@@ -10,6 +10,7 @@ import { authApi } from '../api/client';
 interface User {
   id: number;
   email: string;
+  name: string | null;
 }
 
 interface AuthContextType {