diff --git a/src/app/admin/(dashboard)/user&role/user/page.tsx b/src/app/admin/(dashboard)/user&role/user/page.tsx
index 5f133409..6147337d 100644
--- a/src/app/admin/(dashboard)/user&role/user/page.tsx
+++ b/src/app/admin/(dashboard)/user&role/user/page.tsx
@@ -93,6 +93,7 @@ function ListUser({ search }: { search: string }) {
     const success = await stateUser.update.submit({
       id: userId,
       roleId: newRoleId,
+
     });
 
     if (success) {
@@ -136,9 +137,10 @@ function ListUser({ search }: { search: string }) {
     }
   };
 
-  const filteredData = (data || []).filter(
-    (item) => item.roleId !== "0" // asumsikan id role SUPERADMIN = "0"
-  );
+  const filteredData = (data || []).filter((item) => {
+    return item.roleId !== "0" && item.roleId !== "1";
+  });
+
 
   if (loading || !data) {
     return (
@@ -183,7 +185,7 @@ function ListUser({ search }: { search: string }) {
                       <Select
                         placeholder="Pilih role"
                         data={stateRole.findMany.data
-                          .filter(r => r.id !== "0") // ❌ Sembunyikan SUPERADMIN
+                          .filter(r => r.id !== "0" && r.id !== "1") // ❌ Sembunyikan SUPERADMIN dan DEVELOPER
                           .map(r => ({
                             label: r.name,
                             value: r.id,
diff --git a/src/app/api/[[...slugs]]/_lib/user/updt.ts b/src/app/api/[[...slugs]]/_lib/user/updt.ts
index 3b9a0d38..b51923be 100644
--- a/src/app/api/[[...slugs]]/_lib/user/updt.ts
+++ b/src/app/api/[[...slugs]]/_lib/user/updt.ts
@@ -24,7 +24,7 @@ export default async function userUpdate(context: Context) {
 
     const currentUser = await prisma.user.findUnique({
       where: { id },
-      select: { roleId: true, isActive: true }
+      select: { roleId: true, isActive: true },
     });
 
     if (!currentUser) {
@@ -32,7 +32,15 @@ export default async function userUpdate(context: Context) {
     }
 
     const isRoleChanged = roleId && currentUser.roleId !== roleId;
-    const isActiveChanged = isActive !== undefined && currentUser.isActive !== isActive;
+    const isActiveChanged =
+      isActive !== undefined && currentUser.isActive !== isActive;
+
+    // ✅ Jika role berubah, hapus semua akses menu yang ada
+    if (isRoleChanged) {
+      await prisma.userMenuAccess.deleteMany({
+        where: { userId: id }
+      });
+    }
 
     // ✅ Jika role berubah, reset dan set ulang akses menu
     if (isRoleChanged && roleId) {
@@ -70,10 +78,11 @@ export default async function userUpdate(context: Context) {
         nomor: true,
         isActive: true,
         roleId: true,
-        role: { select: { name: true } }
-      }
+        role: { select: { name: true } },
+      },
     });
 
+    
     // ✅ HAPUS SEMUA SESI USER DI DATABASE
     if (isRoleChanged) {
       await prisma.userSession.deleteMany({ where: { userId: id } });
@@ -84,11 +93,13 @@ export default async function userUpdate(context: Context) {
       roleChanged: isRoleChanged,
       isActiveChanged,
       data: updatedUser,
-      message: isRoleChanged 
+      message: isRoleChanged
         ? `Role ${updatedUser.username} diubah. User akan logout otomatis.`
         : isActiveChanged
-        ? `${updatedUser.username} ${isActive ? 'diaktifkan' : 'dinonaktifkan'}.`
-        : "User berhasil diupdate"
+        ? `${updatedUser.username} ${
+            isActive ? "diaktifkan" : "dinonaktifkan"
+          }.`
+        : "User berhasil diupdate",
     };
   } catch (e: any) {
     console.error("❌ Error update user:", e);
@@ -97,4 +108,4 @@ export default async function userUpdate(context: Context) {
       message: "Gagal mengupdate user: " + (e.message || "Unknown error"),
     };
   }
-}
\ No newline at end of file
+}