diff --git a/endpoints/logout.post.py b/endpoints/logout.post.py
index ac87ec6..300d5ca 100644
--- a/endpoints/logout.post.py
+++ b/endpoints/logout.post.py
@@ -9,17 +9,17 @@ async def logout_handler(
     db: Session = Depends(get_db)
 ):
     """Demo logout endpoint"""
-    user = get_user_from_token(token, db)
+    user = get_current_user(token, db)
     if not user:
-        raise HTTPException(status_code=401, detail="Invalid token")
-    
-    fake_users_db[user["username"]]["disabled"] = True
+        raise HTTPException(status_code=401, detail="Invalid authentication credentials")
     
+    # Invalidate token or remove user session
+    fake_users_db[user.username]["disabled"] = True
+
     return {
         "message": "Logout successful",
-        "user": user["username"],
-        "next_steps": [
-            "Clear browser cookies",
-            "Revoke refresh token"
-        ]
+        "metadata": {
+            "user_id": user.id,
+            "username": user.username
+        }
     }
\ No newline at end of file