diff --git a/backend/app/schemas/user.py b/backend/app/schemas/user.py
index b8983cb6..5b580e67 100644
--- a/backend/app/schemas/user.py
+++ b/backend/app/schemas/user.py
@@ -40,8 +40,8 @@ class UserLogin(BaseModel):
 class UserResponse(UserBase):
     id: UUID
     role: str = "engineer"
-    account_id: UUID
-    account_role: str
+    account_id: Optional[UUID] = None
+    account_role: Optional[str] = None
     is_super_admin: bool = False
     is_active: bool = True
     must_change_password: bool = False
diff --git a/frontend/src/types/user.ts b/frontend/src/types/user.ts
index 3a4adb15..f8b02582 100644
--- a/frontend/src/types/user.ts
+++ b/frontend/src/types/user.ts
@@ -8,8 +8,8 @@ export interface User {
   is_super_admin: boolean
   is_active: boolean
   must_change_password: boolean
-  account_id: string
-  account_role: 'owner' | 'engineer' | 'viewer'
+  account_id: string | null
+  account_role: 'owner' | 'engineer' | 'viewer' | null
   created_at: string
   last_login: string | null
 }