diff --git a/water-api/src/controllers/user.controller.ts b/water-api/src/controllers/user.controller.ts
index a028b50..93e4bac 100644
--- a/water-api/src/controllers/user.controller.ts
+++ b/water-api/src/controllers/user.controller.ts
@@ -79,8 +79,8 @@ export async function getUserById(
 
     // Check if user is admin or requesting their own data
     const requestingUser = req.user;
-    const isAdmin = requestingUser?.role === 'ADMIN';
-    const isSelf = requestingUser?.id === userId;
+    const isAdmin = requestingUser?.roleName === 'ADMIN';
+    const isSelf = requestingUser?.userId === userId;
 
     if (!isAdmin && !isSelf) {
       res.status(403).json({
@@ -177,8 +177,8 @@ export async function updateUser(
     }
 
     const requestingUser = req.user;
-    const isAdmin = requestingUser?.role === 'ADMIN';
-    const isSelf = requestingUser?.id === userId;
+    const isAdmin = requestingUser?.roleName === 'ADMIN';
+    const isSelf = requestingUser?.userId === userId;
 
     if (!isAdmin && !isSelf) {
       res.status(403).json({