diff --git a/backend/main.py b/backend/main.py
index 7e2188d..1f74ee5 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -103,7 +103,7 @@ def get_current_user(token: str = Depends(oauth2_scheme), session: Session = Dep
     except ValueError:
         raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid token subject")
         
-    user = session.get(models.User, user_id)
+    user = ensure_demo_user(user_id, session) or session.get(models.User, user_id)
     if not user:
         raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="User not found")
     return user