diff --git a/endpoints/api/users.post.py b/endpoints/api/users.post.py
index 368b851..a388694 100644
--- a/endpoints/api/users.post.py
+++ b/endpoints/api/users.post.py
@@ -5,22 +5,19 @@ router = APIRouter()
 
 @router.post("/api/users")
 async def users_handler():
-    """Fetch all users from database"""
-    users = [
-        {
-            "id": data["id"],
-            "username": username,
-            "email": data["email"],
-            "disabled": data["disabled"]
+    """Get all users from database"""
+    try:
+        users = list(fake_users_db.values())
+        return {
+            "message": "Users retrieved successfully",
+            "data": users,
+            "metadata": {
+                "total_users": len(users),
+                "source": "demo_db"
+            }
         }
-        for username, data in fake_users_db.items()
-    ]
-    
-    return {
-        "message": "Users retrieved successfully",
-        "data": users,
-        "metadata": {
-            "total_count": len(users),
-            "source": "demo_db"
-        }
-    }
\ No newline at end of file
+    except Exception as e:
+        raise HTTPException(
+            status_code=500,
+            detail="Error retrieving users"
+        )
\ No newline at end of file