diff --git a/apps/web/components/dashboard/admin/AddUserDialog.tsx b/apps/web/components/dashboard/admin/AddUserDialog.tsx
index 0581511d..a13c6b88 100644
--- a/apps/web/components/dashboard/admin/AddUserDialog.tsx
+++ b/apps/web/components/dashboard/admin/AddUserDialog.tsx
@@ -8,6 +8,7 @@ import {
   DialogFooter,
   DialogHeader,
   DialogTitle,
+  DialogTrigger,
 } from "@/components/ui/dialog";
 import {
   Form,
@@ -18,28 +19,31 @@ import {
   FormMessage,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
 import { toast } from "@/components/ui/use-toast";
-import { api } from "@/lib/trpc"; // Adjust the import path as needed
+import { api } from "@/lib/trpc";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { TRPCClientError } from "@trpc/client";
-import { SubmitHandler, useForm } from "react-hook-form";
+import { useForm } from "react-hook-form";
 import { z } from "zod";
 
-import { zAdminCreateUserSchema } from "@hoarder/shared/types/users";
+import { zAdminCreateUserSchema } from "@hoarder/shared/types/admin";
 
 type AdminCreateUserSchema = z.infer<typeof zAdminCreateUserSchema>;
 
-interface AddUserDialogProps {
-  isOpen: boolean;
-  onOpenChange: (isOpen: boolean) => void;
-  onUserAdded: () => void;
-}
-
 export default function AddUserDialog({
-  isOpen,
-  onOpenChange,
-  onUserAdded,
-}: AddUserDialogProps) {
+  children,
+}: {
+  children?: React.ReactNode;
+}) {
+  const apiUtils = api.useUtils();
+  const [isOpen, onOpenChange] = useState(false);
   const form = useForm<AdminCreateUserSchema>({
     resolver: zodResolver(zAdminCreateUserSchema),
     defaultValues: {
@@ -48,24 +52,18 @@ export default function AddUserDialog({
       password: "",
       confirmPassword: "",
       role: "user",
-      adminPassword: "",
     },
   });
-  const [isLoading, setIsLoading] = useState(false);
-  const createUserMutation = api.admin.createUser.useMutation();
-
-  const handleCreateUser: SubmitHandler<AdminCreateUserSchema> = async (
-    data,
-  ) => {
-    setIsLoading(true);
-    try {
-      await createUserMutation.mutateAsync(data);
+  const { mutate, isPending } = api.admin.createUser.useMutation({
+    onSuccess: () => {
       toast({
         description: "User created successfully",
       });
       onOpenChange(false);
-      onUserAdded();
-    } catch (error) {
+      apiUtils.users.list.invalidate();
+      apiUtils.admin.userStats.invalidate();
+    },
+    onError: (error) => {
       if (error instanceof TRPCClientError) {
         toast({
           variant: "destructive",
@@ -77,10 +75,8 @@ export default function AddUserDialog({
           description: "Failed to create user",
         });
       }
-    } finally {
-      setIsLoading(false);
-    }
-  };
+    },
+  });
 
   useEffect(() => {
     if (!isOpen) {
@@ -90,12 +86,13 @@ export default function AddUserDialog({
 
   return (
     <Dialog open={isOpen} onOpenChange={onOpenChange}>
+      <DialogTrigger asChild>{children}</DialogTrigger>
       <DialogContent>
         <DialogHeader>
           <DialogTitle>Add User</DialogTitle>
         </DialogHeader>
         <Form {...form}>
-          <form onSubmit={form.handleSubmit(handleCreateUser)}>
+          <form onSubmit={form.handleSubmit((val) => mutate(val))}>
             <div className="flex w-full flex-col space-y-2">
               <FormField
                 control={form.control}
@@ -176,36 +173,23 @@ export default function AddUserDialog({
                   <FormItem>
                     <FormLabel>Role</FormLabel>
                     <FormControl>
-                      <select {...field} className="w-full rounded border p-2">
-                        <option value="user">User</option>
-                        <option value="admin">Admin</option>
-                      </select>
+                      <Select
+                        value={field.value}
+                        onValueChange={field.onChange}
+                      >
+                        <SelectTrigger className="w-full">
+                          <SelectValue />
+                        </SelectTrigger>
+                        <SelectContent>
+                          <SelectItem value="user">User</SelectItem>
+                          <SelectItem value="admin">Admin</SelectItem>
+                        </SelectContent>
+                      </Select>
                     </FormControl>
                     <FormMessage />
                   </FormItem>
                 )}
               />
-              <hr className="my-4" />
-              <div className="mt-8">
-                <FormField
-                  control={form.control}
-                  name="adminPassword"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>Admin Password</FormLabel>
-                      <FormControl>
-                        <Input
-                          type="password"
-                          placeholder="Admin Password"
-                          {...field}
-                          className="w-full rounded border p-2"
-                        />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-              </div>
               <DialogFooter className="sm:justify-end">
                 <DialogClose asChild>
                   <Button type="button" variant="secondary">
@@ -214,8 +198,8 @@ export default function AddUserDialog({
                 </DialogClose>
                 <ActionButton
                   type="submit"
-                  loading={isLoading}
-                  disabled={isLoading}
+                  loading={isPending}
+                  disabled={isPending}
                 >
                   Create
                 </ActionButton>
diff --git a/apps/web/components/dashboard/admin/ChangeRoleDialog.tsx b/apps/web/components/dashboard/admin/ChangeRoleDialog.tsx
index 3e4d8452..26ad5dce 100644
--- a/apps/web/components/dashboard/admin/ChangeRoleDialog.tsx
+++ b/apps/web/components/dashboard/admin/ChangeRoleDialog.tsx
@@ -8,6 +8,7 @@ import {
   DialogFooter,
   DialogHeader,
   DialogTitle,
+  DialogTrigger,
 } from "@/components/ui/dialog";
 import {
   Form,
@@ -17,55 +18,53 @@ import {
   FormLabel,
   FormMessage,
 } from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
 import { toast } from "@/components/ui/use-toast";
-import { api } from "@/lib/trpc"; // Adjust the import path as needed
+import { api } from "@/lib/trpc";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { TRPCClientError } from "@trpc/client";
-import { SubmitHandler, useForm } from "react-hook-form";
+import { useForm } from "react-hook-form";
 import { z } from "zod";
 
-import { changeRoleSchema } from "@hoarder/shared/types/users";
+import { changeRoleSchema } from "@hoarder/shared/types/admin";
 
 type ChangeRoleSchema = z.infer<typeof changeRoleSchema>;
 
 interface ChangeRoleDialogProps {
-  isOpen: boolean;
-  onOpenChange: (isOpen: boolean) => void;
   userId: string;
   currentRole: "user" | "admin";
-  onRoleChanged: () => void;
+  children?: React.ReactNode;
 }
 
 export default function ChangeRoleDialog({
-  isOpen,
-  onOpenChange,
   userId,
   currentRole,
-  onRoleChanged,
+  children,
 }: ChangeRoleDialogProps) {
-  console.log(currentRole);
+  const apiUtils = api.useUtils();
+  const [isOpen, onOpenChange] = useState(false);
   const form = useForm<ChangeRoleSchema>({
     resolver: zodResolver(changeRoleSchema),
     defaultValues: {
-      userId: "",
+      userId,
       role: currentRole,
-      adminPassword: "",
     },
   });
-  const [isLoading, setIsLoading] = useState(false);
-  const changeRoleMutation = api.admin.changeRole.useMutation();
-
-  const handleChangeRole: SubmitHandler<ChangeRoleSchema> = async (data) => {
-    setIsLoading(true);
-    try {
-      await changeRoleMutation.mutateAsync({ ...data, userId });
+  const { mutate, isPending } = api.admin.changeRole.useMutation({
+    onSuccess: () => {
       toast({
         description: "Role changed successfully",
       });
+      apiUtils.users.list.invalidate();
       onOpenChange(false);
-      onRoleChanged();
-    } catch (error) {
+    },
+    onError: (error) => {
       if (error instanceof TRPCClientError) {
         toast({
           variant: "destructive",
@@ -77,29 +76,25 @@ export default function ChangeRoleDialog({
           description: "Failed to change role",
         });
       }
-    } finally {
-      setIsLoading(false);
-    }
-  };
+    },
+  });
 
   useEffect(() => {
     if (isOpen) {
-      form.reset({
-        userId,
-        role: currentRole,
-        adminPassword: "",
-      });
+      form.reset();
     }
-  }, [isOpen, form, userId, currentRole]);
+  }, [isOpen, form]);
 
   return (
     <Dialog open={isOpen} onOpenChange={onOpenChange}>
+      <DialogTrigger asChild>{children}</DialogTrigger>
       <DialogContent>
+        <DialogTrigger asChild></DialogTrigger>
         <DialogHeader>
           <DialogTitle>Change Role</DialogTitle>
         </DialogHeader>
         <Form {...form}>
-          <form onSubmit={form.handleSubmit(handleChangeRole)}>
+          <form onSubmit={form.handleSubmit((val) => mutate(val))}>
             <div className="flex w-full flex-col space-y-2">
               <FormField
                 control={form.control}
@@ -108,10 +103,18 @@ export default function ChangeRoleDialog({
                   <FormItem>
                     <FormLabel>Role</FormLabel>
                     <FormControl>
-                      <select {...field} className="w-full rounded border p-2">
-                        <option value="user">User</option>
-                        <option value="admin">Admin</option>
-                      </select>
+                      <Select
+                        onValueChange={field.onChange}
+                        defaultValue={field.value}
+                      >
+                        <SelectTrigger className="w-full">
+                          <SelectValue />
+                        </SelectTrigger>
+                        <SelectContent>
+                          <SelectItem value="user">User</SelectItem>
+                          <SelectItem value="admin">Admin</SelectItem>
+                        </SelectContent>
+                      </Select>
                     </FormControl>
                     <FormMessage />
                   </FormItem>
@@ -119,19 +122,12 @@ export default function ChangeRoleDialog({
               />
               <FormField
                 control={form.control}
-                name="adminPassword"
+                name="userId"
                 render={({ field }) => (
                   <FormItem>
-                    <FormLabel>Admin Password</FormLabel>
                     <FormControl>
-                      <Input
-                        type="password"
-                        placeholder="Admin Password"
-                        {...field}
-                        className="w-full rounded border p-2"
-                      />
+                      <input type="hidden" {...field} />
                     </FormControl>
-                    <FormMessage />
                   </FormItem>
                 )}
               />
@@ -143,8 +139,8 @@ export default function ChangeRoleDialog({
                 </DialogClose>
                 <ActionButton
                   type="submit"
-                  loading={isLoading}
-                  disabled={isLoading}
+                  loading={isPending}
+                  disabled={isPending}
                 >
                   Change
                 </ActionButton>
diff --git a/apps/web/components/dashboard/admin/ResetPasswordDialog.tsx b/apps/web/components/dashboard/admin/ResetPasswordDialog.tsx
index 22a31135..32183d1a 100644
--- a/apps/web/components/dashboard/admin/ResetPasswordDialog.tsx
+++ b/apps/web/components/dashboard/admin/ResetPasswordDialog.tsx
@@ -8,6 +8,7 @@ import {
   DialogFooter,
   DialogHeader,
   DialogTitle,
+  DialogTrigger,
 } from "@/components/ui/dialog";
 import {
   Form,
@@ -22,47 +23,39 @@ import { toast } from "@/components/ui/use-toast";
 import { api } from "@/lib/trpc"; // Adjust the import path as needed
 import { zodResolver } from "@hookform/resolvers/zod";
 import { TRPCClientError } from "@trpc/client";
-import { SubmitHandler, useForm } from "react-hook-form";
+import { useForm } from "react-hook-form";
 import { z } from "zod";
 
-import { resetPasswordSchema } from "@hoarder/shared/types/users";
+import { resetPasswordSchema } from "@hoarder/shared/types/admin";
 
 interface ResetPasswordDialogProps {
-  isOpen: boolean;
-  onOpenChange: (isOpen: boolean) => void;
   userId: string;
+  children?: React.ReactNode;
 }
 
 type ResetPasswordSchema = z.infer<typeof resetPasswordSchema>;
 
 export default function ResetPasswordDialog({
-  isOpen,
-  onOpenChange,
+  children,
   userId,
 }: ResetPasswordDialogProps) {
+  const [isOpen, onOpenChange] = useState(false);
   const form = useForm<ResetPasswordSchema>({
     resolver: zodResolver(resetPasswordSchema),
     defaultValues: {
-      userId: "",
+      userId,
       newPassword: "",
       newPasswordConfirm: "",
-      adminPassword: "",
     },
   });
-  const [isLoading, setIsLoading] = useState(false);
-  const resetPasswordMutation = api.admin.resetPassword.useMutation();
-
-  const handleResetPassword: SubmitHandler<ResetPasswordSchema> = async (
-    data,
-  ) => {
-    setIsLoading(true);
-    try {
-      await resetPasswordMutation.mutateAsync({ ...data, userId });
+  const { mutate, isPending } = api.admin.resetPassword.useMutation({
+    onSuccess: () => {
       toast({
         description: "Password reset successfully",
       });
       onOpenChange(false);
-    } catch (error) {
+    },
+    onError: (error) => {
       if (error instanceof TRPCClientError) {
         toast({
           variant: "destructive",
@@ -74,30 +67,24 @@ export default function ResetPasswordDialog({
           description: "Failed to reset password",
         });
       }
-    } finally {
-      setIsLoading(false);
-    }
-  };
+    },
+  });
 
   useEffect(() => {
     if (isOpen) {
-      form.reset({
-        userId,
-        newPassword: "",
-        newPasswordConfirm: "",
-        adminPassword: "",
-      });
+      form.reset();
     }
-  }, [isOpen, form, userId]);
+  }, [isOpen, form]);
 
   return (
     <Dialog open={isOpen} onOpenChange={onOpenChange}>
+      <DialogTrigger asChild>{children}</DialogTrigger>
       <DialogContent>
         <DialogHeader>
           <DialogTitle>Reset Password</DialogTitle>
         </DialogHeader>
         <Form {...form}>
-          <form onSubmit={form.handleSubmit(handleResetPassword)}>
+          <form onSubmit={form.handleSubmit((val) => mutate(val))}>
             <div className="flex w-full flex-col space-y-2">
               <FormField
                 control={form.control}
@@ -135,24 +122,6 @@ export default function ResetPasswordDialog({
                   </FormItem>
                 )}
               />
-              <FormField
-                control={form.control}
-                name="adminPassword"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>Admin Password</FormLabel>
-                    <FormControl>
-                      <Input
-                        type="password"
-                        placeholder="Admin Password"
-                        {...field}
-                        className="w-full rounded border p-2"
-                      />
-                    </FormControl>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
               <DialogFooter className="sm:justify-end">
                 <DialogClose asChild>
                   <Button type="button" variant="secondary">
@@ -161,8 +130,8 @@ export default function ResetPasswordDialog({
                 </DialogClose>
                 <ActionButton
                   type="submit"
-                  loading={isLoading}
-                  disabled={isLoading}
+                  loading={isPending}
+                  disabled={isPending}
                 >
                   Reset
                 </ActionButton>
diff --git a/apps/web/components/dashboard/admin/UserList.tsx b/apps/web/components/dashboard/admin/UserList.tsx
index 36bcbd7c..2937df28 100644
--- a/apps/web/components/dashboard/admin/UserList.tsx
+++ b/apps/web/components/dashboard/admin/UserList.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { useState } from "react";
-import { ActionButton } from "@/components/ui/action-button";
+import { ActionButtonWithTooltip } from "@/components/ui/action-button";
+import { ButtonWithTooltip } from "@/components/ui/button";
 import LoadingSpinner from "@/components/ui/spinner";
 import {
   Table,
@@ -30,9 +30,8 @@ function toHumanReadableSize(size: number) {
 export default function UsersSection() {
   const { data: session } = useSession();
   const invalidateUserList = api.useUtils().users.list.invalidate;
-  const { data: users, refetch: refetchUsers } = api.users.list.useQuery();
-  const { data: userStats, refetch: refetchUserStats } =
-    api.admin.userStats.useQuery();
+  const { data: users } = api.users.list.useQuery();
+  const { data: userStats } = api.admin.userStats.useQuery();
   const { mutate: deleteUser, isPending: isDeletionPending } =
     api.users.delete.useMutation({
       onSuccess: () => {
@@ -49,35 +48,6 @@ export default function UsersSection() {
       },
     });
 
-  const [isDialogOpen, setIsDialogOpen] = useState(false);
-  const [isResetPasswordDialogOpen, setIsResetPasswordDialogOpen] =
-    useState(false);
-  const [isChangeRoleDialogOpen, setIsChangeRoleDialogOpen] = useState(false);
-  const [selectedUserId, setSelectedUserId] = useState<string | null>(null);
-  const [selectedUserRole, setSelectedUserRole] = useState<
-    "user" | "admin" | null
-  >(null);
-
-  const refreshUserList = () => {
-    invalidateUserList();
-    refetchUsers();
-    refetchUserStats();
-  };
-
-  const handleOpenResetPasswordDialog = (userId: string) => {
-    setSelectedUserId(userId);
-    setIsResetPasswordDialogOpen(true);
-  };
-
-  const handleOpenChangeRoleDialog = (
-    userId: string,
-    role: "user" | "admin",
-  ) => {
-    setSelectedUserId(userId);
-    setSelectedUserRole(role);
-    setIsChangeRoleDialogOpen(true);
-  };
-
   if (!users || !userStats) {
     return <LoadingSpinner />;
   }
@@ -86,13 +56,11 @@ export default function UsersSection() {
     <>
       <div className="mb-2 flex items-center justify-between text-xl font-medium">
         <span>Users List</span>
-        <ActionButton
-          variant="outline"
-          onClick={() => setIsDialogOpen(true)}
-          loading={isDeletionPending}
-        >
-          <UserPlus size={16} />
-        </ActionButton>
+        <AddUserDialog>
+          <ButtonWithTooltip tooltip="Create User" variant="outline">
+            <UserPlus size={16} />
+          </ButtonWithTooltip>
+        </AddUserDialog>
       </div>
 
       <Table>
@@ -120,54 +88,39 @@ export default function UsersSection() {
               <TableCell className="py-1 capitalize">
                 {u.localUser ? <Check /> : <X />}
               </TableCell>
-              <TableCell className="py-1">
-                <ActionButton
+              <TableCell className="flex gap-1 py-1">
+                <ActionButtonWithTooltip
+                  tooltip="Delete user"
                   variant="outline"
                   onClick={() => deleteUser({ userId: u.id })}
                   loading={isDeletionPending}
                   disabled={session!.user.id == u.id}
                 >
                   <Trash size={16} color="red" />
-                </ActionButton>
-                <ActionButton
-                  variant="outline"
-                  onClick={() => handleOpenResetPasswordDialog(u.id)}
-                  loading={isDeletionPending}
-                  disabled={session!.user.id == u.id || !u.localUser}
-                >
-                  <KeyRound size={16} color="red" />
-                </ActionButton>
-                <ActionButton
-                  variant="outline"
-                  onClick={() => handleOpenChangeRoleDialog(u.id, u.role!)}
-                  loading={isDeletionPending}
-                  disabled={session!.user.id == u.id || !u.localUser}
-                >
-                  <Pencil size={16} color="red" />
-                </ActionButton>
+                </ActionButtonWithTooltip>
+                <ResetPasswordDialog userId={u.id}>
+                  <ButtonWithTooltip
+                    tooltip="Reset password"
+                    variant="outline"
+                    disabled={session!.user.id == u.id || !u.localUser}
+                  >
+                    <KeyRound size={16} color="red" />
+                  </ButtonWithTooltip>
+                </ResetPasswordDialog>
+                <ChangeRoleDialog userId={u.id} currentRole={u.role!}>
+                  <ButtonWithTooltip
+                    tooltip="Change role"
+                    variant="outline"
+                    disabled={session!.user.id == u.id}
+                  >
+                    <Pencil size={16} color="red" />
+                  </ButtonWithTooltip>
+                </ChangeRoleDialog>
               </TableCell>
             </TableRow>
           ))}
         </TableBody>
       </Table>
-
-      <AddUserDialog
-        isOpen={isDialogOpen}
-        onOpenChange={setIsDialogOpen}
-        onUserAdded={refreshUserList}
-      />
-      <ResetPasswordDialog
-        isOpen={isResetPasswordDialogOpen}
-        onOpenChange={setIsResetPasswordDialogOpen}
-        userId={selectedUserId!}
-      />
-      <ChangeRoleDialog
-        isOpen={isChangeRoleDialogOpen}
-        onOpenChange={setIsChangeRoleDialogOpen}
-        userId={selectedUserId!}
-        currentRole={selectedUserRole!}
-        onRoleChanged={refreshUserList}
-      />
     </>
   );
 }
diff --git a/packages/shared/types/admin.ts b/packages/shared/types/admin.ts
new file mode 100644
index 00000000..8b16dfd0
--- /dev/null
+++ b/packages/shared/types/admin.ts
@@ -0,0 +1,25 @@
+import { z } from "zod";
+
+import { PASSWORD_MAX_LENGTH, zSignUpSchema } from "./users";
+
+export const zRoleSchema = z.object({
+  role: z.enum(["user", "admin"]),
+});
+
+export const zAdminCreateUserSchema = zSignUpSchema.and(zRoleSchema);
+
+export const changeRoleSchema = z.object({
+  userId: z.string(),
+  role: z.enum(["user", "admin"]),
+});
+
+export const resetPasswordSchema = z
+  .object({
+    userId: z.string(),
+    newPassword: z.string().min(8).max(PASSWORD_MAX_LENGTH),
+    newPasswordConfirm: z.string(),
+  })
+  .refine((data) => data.newPassword === data.newPasswordConfirm, {
+    message: "Passwords don't match",
+    path: ["newPasswordConfirm"],
+  });
diff --git a/packages/shared/types/users.ts b/packages/shared/types/users.ts
index bf098dde..7d97a6d9 100644
--- a/packages/shared/types/users.ts
+++ b/packages/shared/types/users.ts
@@ -1,6 +1,6 @@
 import { z } from "zod";
 
-const PASSWORD_MAX_LENGTH = 100;
+export const PASSWORD_MAX_LENGTH = 100;
 
 export const zSignUpSchema = z
   .object({
@@ -14,31 +14,6 @@ export const zSignUpSchema = z
     path: ["confirmPassword"],
   });
 
-export const zRoleSchema = z.object({
-  role: z.enum(["user", "admin"]),
-  adminPassword: z.string(),
-});
-
-export const zAdminCreateUserSchema = zSignUpSchema.and(zRoleSchema);
-
-export const changeRoleSchema = z.object({
-  userId: z.string(),
-  role: z.enum(["user", "admin"]),
-  adminPassword: z.string().min(8, "Password must be at least 8 characters"),
-});
-
-export const resetPasswordSchema = z
-  .object({
-    userId: z.string(),
-    newPassword: z.string().min(8).max(PASSWORD_MAX_LENGTH),
-    newPasswordConfirm: z.string(),
-    adminPassword: z.string().min(8, "Password must be at least 8 characters"),
-  })
-  .refine((data) => data.newPassword === data.newPasswordConfirm, {
-    message: "Passwords don't match",
-    path: ["newPasswordConfirm"],
-  });
-
 export const zChangePasswordSchema = z
   .object({
     currentPassword: z.string(),
diff --git a/packages/trpc/routers/admin.ts b/packages/trpc/routers/admin.ts
index 788db834..38aa0031 100644
--- a/packages/trpc/routers/admin.ts
+++ b/packages/trpc/routers/admin.ts
@@ -1,6 +1,5 @@
 import { TRPCError } from "@trpc/server";
 import { count, eq, sum } from "drizzle-orm";
-import invariant from "tiny-invariant";
 import { z } from "zod";
 
 import { assets, bookmarkLinks, bookmarks, users } from "@hoarder/db/schema";
@@ -15,9 +14,9 @@ import {
   changeRoleSchema,
   resetPasswordSchema,
   zAdminCreateUserSchema,
-} from "@hoarder/shared/types/users";
+} from "@hoarder/shared/types/admin";
 
-import { hashPassword, validatePassword } from "../auth";
+import { hashPassword } from "../auth";
 import { adminProcedure, router } from "../index";
 import { createUser } from "./users";
 
@@ -233,87 +232,48 @@ export const adminAppRouter = router({
       }),
     )
     .mutation(async ({ input, ctx }) => {
-      invariant(ctx.user.email, "A user always has an email specified");
-      try {
-        await validatePassword(ctx.user.email, input.adminPassword);
-      } catch (e) {
-        throw new TRPCError({ code: "UNAUTHORIZED" });
-      }
-
       return createUser(input, ctx, input.role);
     }),
   changeRole: adminProcedure
     .input(changeRoleSchema)
     .mutation(async ({ input, ctx }) => {
-      invariant(ctx.user.email, "A user always has an email specified");
-      try {
-        await validatePassword(ctx.user.email, input.adminPassword);
-      } catch (e) {
-        throw new TRPCError({ code: "UNAUTHORIZED" });
+      if (ctx.user.id == input.userId) {
+        throw new TRPCError({
+          code: "BAD_REQUEST",
+          message: "Cannot change own role",
+        });
       }
+      const result = await ctx.db
+        .update(users)
+        .set({ role: input.role })
+        .where(eq(users.id, input.userId));
 
-      try {
-        const result = await ctx.db
-          .update(users)
-          .set({ role: input.role })
-          .where(eq(users.id, input.userId))
-          .returning({
-            id: users.id,
-            name: users.name,
-            email: users.email,
-            role: users.role,
-          });
-
-        if (!result.length) {
-          throw new TRPCError({
-            code: "NOT_FOUND",
-            message: "User not found",
-          });
-        }
-
-        return result;
-      } catch (e) {
+      if (!result.changes) {
         throw new TRPCError({
-          code: "INTERNAL_SERVER_ERROR",
-          message: "Something went wrong",
+          code: "NOT_FOUND",
+          message: "User not found",
         });
       }
     }),
   resetPassword: adminProcedure
     .input(resetPasswordSchema)
     .mutation(async ({ input, ctx }) => {
-      invariant(ctx.user.email, "A user always has an email specified");
-      try {
-        await validatePassword(ctx.user.email, input.adminPassword);
-      } catch (e) {
-        throw new TRPCError({ code: "UNAUTHORIZED" });
+      if (ctx.user.id == input.userId) {
+        throw new TRPCError({
+          code: "BAD_REQUEST",
+          message: "Cannot reset own password",
+        });
       }
+      const hashedPassword = await hashPassword(input.newPassword);
+      const result = await ctx.db
+        .update(users)
+        .set({ password: hashedPassword })
+        .where(eq(users.id, input.userId));
 
-      try {
-        const hashedPassword = await hashPassword(input.newPassword);
-        const result = await ctx.db
-          .update(users)
-          .set({ password: hashedPassword })
-          .where(eq(users.id, input.userId))
-          .returning({
-            id: users.id,
-            name: users.name,
-            email: users.email,
-            role: users.role,
-          });
-
-        if (!result.length) {
-          throw new TRPCError({
-            code: "NOT_FOUND",
-            message: "User not found",
-          });
-        }
-
-        return result;
-      } catch (e) {
+      if (result.changes == 0) {
         throw new TRPCError({
-          code: "INTERNAL_SERVER_ERROR",
-          message: "Something went wrong",
+          code: "NOT_FOUND",
+          message: "User not found",
         });
       }
     }),
diff --git a/packages/trpc/routers/users.ts b/packages/trpc/routers/users.ts
index d67af10a..ca46d9f7 100644
--- a/packages/trpc/routers/users.ts
+++ b/packages/trpc/routers/users.ts
@@ -1,5 +1,5 @@
 import { TRPCError } from "@trpc/server";
-import { and, count, eq, sql } from "drizzle-orm";
+import { and, count, eq } from "drizzle-orm";
 import invariant from "tiny-invariant";
 import { z } from "zod";
 
@@ -106,32 +106,22 @@ export const usersAppRouter = router({
       }),
     )
     .query(async ({ ctx }) => {
-      let dbUsers = await ctx.db
+      const dbUsers = await ctx.db
         .select({
           id: users.id,
           name: users.name,
           email: users.email,
           role: users.role,
-          localUser: sql<boolean>`CASE WHEN
-                                 ${users.password}
-                                 IS
-                                 NOT
-                                 NULL
-                                 THEN
-                                 true
-                                 ELSE
-                                 false
-                                 END`.as("localUser"),
+          password: users.password,
         })
         .from(users);
 
-      // Ensure the type of localUser is boolean
-      dbUsers = dbUsers.map((user) => ({
-        ...user,
-        localUser: Boolean(user.localUser),
-      }));
-
-      return { users: dbUsers };
+      return {
+        users: dbUsers.map(({ password, ...user }) => ({
+          ...user,
+          localUser: password !== null,
+        })),
+      };
     }),
   changePassword: authedProcedure
     .input(