diff --git a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_disable-user-button.tsx b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_disable-user-button.tsx
index 21662f08d..72f0a757c 100644
--- a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_disable-user-button.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_disable-user-button.tsx
@@ -10,9 +10,10 @@ import { useI18n } from "@homarr/translation/client";
 
 interface DisableUserButtonProps {
   user: RouterOutputs["user"]["getById"];
+  isSelf?: boolean;
 }
 
-export const DisableUserButton = ({ user }: DisableUserButtonProps) => {
+export const DisableUserButton = ({ user, isSelf = false }: DisableUserButtonProps) => {
   const t = useI18n();
   const [isPending, startTransition] = useTransition();
   const changeDisabledMutation = clientApi.user.changeDisabled.useMutation();
@@ -32,6 +33,8 @@ export const DisableUserButton = ({ user }: DisableUserButtonProps) => {
   };
 
   const handleToggle = () => {
+    if (isSelf) return;
+
     startTransition(async () => {
       try {
         await changeDisabledMutation.mutateAsync({
@@ -65,12 +68,13 @@ export const DisableUserButton = ({ user }: DisableUserButtonProps) => {
   const getButtonColor = () => (isDisabled ? "green" : "yellow");
 
   return (
-    <Tooltip label={getTooltipLabel()} position="top">
+    <Tooltip label={isSelf ? t("user.action.disableSelf.disabled", { defaultValue: "Cannot disable your own account" }) : getTooltipLabel()} position="top">
       <Button
         onClick={handleToggle}
         loading={isPending || changeDisabledMutation.isPending}
         color={getButtonColor()}
         variant="light"
+        disabled={isSelf}
       >
         {getButtonLabel()}
       </Button>
diff --git a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/page.tsx b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/page.tsx
index 620b02a33..5074181ef 100644
--- a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/page.tsx
+++ b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/page.tsx
@@ -110,11 +110,13 @@ export default async function EditUserPage(props: Props) {
       )}
 
       <DangerZoneRoot>
-        <DangerZoneItem
-          label={getDisableItemLabel()}
-          description={getDisableItemDescription()}
-          action={<DisableUserButton user={user} />}
-        />
+        {!isSelf && (
+          <DangerZoneItem
+            label={getDisableItemLabel()}
+            description={getDisableItemDescription()}
+            action={<DisableUserButton user={user} isSelf={isSelf} />}
+          />
+        )}
         <DangerZoneItem
           label={t("user.action.delete.label")}
           description={t("user.action.delete.description")}
diff --git a/packages/api/src/router/user.ts b/packages/api/src/router/user.ts
index 328784806..9f34173d9 100644
--- a/packages/api/src/router/user.ts
+++ b/packages/api/src/router/user.ts
@@ -790,7 +790,29 @@ export const userRouter = createTRPCRouter({
       }),
     )
     .output(z.void())
+    .meta({
+      openapi: {
+        method: "PATCH",
+        path: "/api/users/disabled",
+        tags: ["users"],
+        protect: true,
+      },
+    })
     .mutation(async ({ input, ctx }) => {
+      const dbUser = await ctx.db.query.users.findFirst({
+        columns: {
+          id: true,
+        },
+        where: eq(users.id, input.userId),
+      });
+
+      if (!dbUser) {
+        throw new TRPCError({
+          code: "NOT_FOUND",
+          message: "User not found",
+        });
+      }
+
       await ctx.db
         .update(users)
         .set({
diff --git a/packages/auth/callbacks.ts b/packages/auth/callbacks.ts
index dd11786c1..51c9c83e5 100644
--- a/packages/auth/callbacks.ts
+++ b/packages/auth/callbacks.ts
@@ -47,14 +47,9 @@ export const createSessionCallback = (db: Database): NextAuthCallbackOf<"session
       where: eq(users.id, user.id),
       columns: {
         colorScheme: true,
-        disabled: true,
       },
     });
 
-    if (additionalProperties?.disabled) {
-      return null;
-    }
-
     return {
       ...session,
       user: {