From 4caed2aa9eb76267fb77dbea560216beee269b57 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 21 Nov 2025 16:49:32 -0500
Subject: [PATCH 1/3] feat(tasks): add localStorage support for task view
 preference (#1817)

Co-authored-by: Mariano Fuentes <marfuen98@gmail.com>
---
 .../[orgId]/tasks/components/TaskList.tsx     | 34 ++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/apps/app/src/app/(app)/[orgId]/tasks/components/TaskList.tsx b/apps/app/src/app/(app)/[orgId]/tasks/components/TaskList.tsx
index ab8fa7923..79d23ea54 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/components/TaskList.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/components/TaskList.tsx
@@ -7,7 +7,7 @@ import { Check, Circle, FolderTree, List, Plus, XCircle } from 'lucide-react';
 import Image from 'next/image';
 import { useParams } from 'next/navigation';
 import { useQueryState } from 'nuqs';
-import { useMemo, useState } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
 import { CreateTaskSheet } from './CreateTaskSheet';
 import { ModernTaskList } from './ModernTaskList';
 import { SearchInput } from './SearchInput';
@@ -51,7 +51,31 @@ export function TaskList({
   const [statusFilter, setStatusFilter] = useQueryState('status');
   const [assigneeFilter, setAssigneeFilter] = useQueryState('assignee');
   const [createTaskOpen, setCreateTaskOpen] = useQueryState('create-task');
+
+  // Initialize with default, load from localStorage after hydration
   const [activeTab, setActiveTab] = useState<'categories' | 'list'>('categories');
+  const lastLoadedOrgId = useRef<string | null>(null);
+
+  // Load saved preference from localStorage after client-side hydration
+  useEffect(() => {
+    // Reset and load preference when orgId changes or on initial load
+    if (lastLoadedOrgId.current !== orgId) {
+      const saved = localStorage.getItem(`task-view-preference-${orgId}`);
+      if (saved === 'categories' || saved === 'list') {
+        setActiveTab(saved);
+      } else {
+        // Reset to default if no saved preference exists for this org
+        setActiveTab('categories');
+      }
+      lastLoadedOrgId.current = orgId;
+    }
+  }, [orgId]);
+
+  // Save preference to localStorage when user changes it (not on initial load)
+  const handleTabChange = (tab: 'categories' | 'list') => {
+    setActiveTab(tab);
+    localStorage.setItem(`task-view-preference-${orgId}`, tab);
+  };
 
   const eligibleAssignees = useMemo(() => {
     return members
@@ -88,7 +112,9 @@ export function TaskList({
   // Calculate overall stats from all tasks (not filtered)
   const overallStats = useMemo(() => {
     const total = initialTasks.length;
-    const done = initialTasks.filter((t) => t.status === 'done' || t.status === 'not_relevant').length;
+    const done = initialTasks.filter(
+      (t) => t.status === 'done' || t.status === 'not_relevant',
+    ).length;
     const inProgress = initialTasks.filter((t) => t.status === 'in_progress').length;
     const todo = initialTasks.filter((t) => t.status === 'todo').length;
     const completionRate = total > 0 ? Math.round((done / total) * 100) : 0;
@@ -621,7 +647,7 @@ export function TaskList({
         {/* View Toggle */}
         <div className="flex items-center gap-0 rounded-md border border-border bg-card p-0.5">
           <button
-            onClick={() => setActiveTab('categories')}
+            onClick={() => handleTabChange('categories')}
             className={`flex items-center gap-1.5 rounded-sm px-3 py-1.5 text-xs font-medium transition-colors ${
               activeTab === 'categories'
                 ? 'bg-primary text-primary-foreground'
@@ -632,7 +658,7 @@ export function TaskList({
             <span>Categories</span>
           </button>
           <button
-            onClick={() => setActiveTab('list')}
+            onClick={() => handleTabChange('list')}
             className={`flex items-center gap-1.5 rounded-sm px-3 py-1.5 text-xs font-medium transition-colors ${
               activeTab === 'list'
                 ? 'bg-primary text-primary-foreground'

From b3d9e0a10259def856dbccf276f984c7ceeba79c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 24 Nov 2025 09:20:52 -0500
Subject: [PATCH 2/3] Make the member deactivated when removing it from the org
 (#1711)

* feat(db): add deactivated column to member table

* fix(db): publish new db version: 1.3.16

* fix(api): remove access from deactivated members

* fix(app): remove access from deactivated members

* fix(portal): remove access from deactivated members

* fix(app): make member deactivated when removing

* fix(api): include deactivated value to comments API response

* fix(app): show alert icon for deactivated users on RecentLogs and comments

* fix(db): remove duplicated migration script for user deactivation

* fix(app): reinvite the deactivate employee

* feat(app): send an email to owner when the user is an assignee when removing a member

---------

Co-authored-by: chasprowebdev <chasgarciaprowebdev@gmail.com>
Co-authored-by: Mariano Fuentes <marfuen98@gmail.com>
---
 apps/api/src/auth/hybrid-auth.guard.ts        |   1 +
 apps/api/src/comments/comments.service.ts     |   4 +
 .../src/comments/dto/comment-responses.dto.ts |   7 +
 apps/api/src/devices/devices.service.ts       |   2 +
 apps/api/src/people/utils/member-queries.ts   |   2 +-
 apps/api/src/people/utils/member-validator.ts |   2 +
 apps/app/src/actions/add-comment.ts           |   1 +
 apps/app/src/actions/change-organization.ts   |   1 +
 .../actions/organization/accept-invitation.ts |   1 +
 .../get-organization-users-action.ts          |   1 +
 .../accept-requested-policy-changes.ts        |   2 +
 .../src/actions/policies/create-new-policy.ts |   1 +
 .../policies/deny-requested-policy-changes.ts |   1 +
 apps/app/src/actions/policies/publish-all.ts  |   2 +
 apps/app/src/actions/safe-action.ts           |   1 +
 .../src/app/(app)/[orgId]/frameworks/page.tsx |   1 +
 apps/app/src/app/(app)/[orgId]/layout.tsx     |   1 +
 .../all/actions/addEmployeeWithoutInvite.ts   |  42 ++++-
 .../people/all/actions/removeMember.ts        | 174 +++++++++++++++++-
 .../people/all/actions/revokeInvitation.ts    |   1 +
 .../people/all/components/TeamMembers.tsx     |   1 +
 .../all/components/TeamMembersClient.tsx      |   2 +-
 .../components/EmployeesOverview.tsx          |   1 +
 .../[orgId]/people/devices/data/index.ts      |   1 +
 .../src/app/(app)/[orgId]/people/layout.tsx   |   1 +
 .../[policyId]/components/RecentAuditLogs.tsx |  33 +++-
 .../[orgId]/policies/[policyId]/data/index.ts |   2 +
 .../(app)/[orgId]/risk/(overview)/page.tsx    |   1 +
 .../app/(app)/[orgId]/risk/[riskId]/page.tsx  |   1 +
 apps/app/src/app/(app)/[orgId]/tasks/page.tsx |   1 +
 .../(overview)/actions/deleteVendor.ts        |   1 +
 .../vendors/(overview)/data/queries.ts        |   1 +
 .../(app)/[orgId]/vendors/[vendorId]/page.tsx |   1 +
 .../[vendorId]/tasks/[taskId]/page.tsx        |   1 +
 .../vendors/backup-overview/layout.tsx        |   1 +
 .../onboarding/actions/complete-onboarding.ts |   1 +
 .../src/app/(app)/upgrade/[orgId]/page.tsx    |   1 +
 apps/app/src/app/api/secrets/[id]/route.ts    |   2 +
 apps/app/src/app/api/secrets/route.ts         |   1 +
 apps/app/src/app/page.tsx                     |   1 +
 .../src/components/comments/CommentItem.tsx   |  50 ++++-
 apps/app/src/components/comments/Comments.tsx |   1 +
 apps/app/src/hooks/use-comments-api.ts        |   2 +
 .../backfill-training-videos-for-org.ts       |   1 +
 .../onboard-organization-helpers.ts           |   1 +
 .../tasks/onboarding/onboard-organization.ts  |   1 +
 .../src/app/(app)/(home)/[orgId]/page.tsx     |   1 +
 .../(home)/[orgId]/policy/[policyId]/page.tsx |   1 +
 .../(app)/(home)/actions/getPolicyPdfUrl.ts   |   2 +-
 .../(home)/actions/markPolicyAsCompleted.ts   |   1 +
 .../(home)/actions/markVideoAsCompleted.ts    |   1 +
 .../src/app/api/download-agent/utils.ts       |   1 +
 packages/docs/openapi.json                    |   9 +-
 .../emails/unassigned-items-notification.tsx  | 167 +++++++++++++++++
 packages/email/index.ts                       |   2 +
 .../lib/unassigned-items-notification.ts      |  58 ++++++
 56 files changed, 576 insertions(+), 26 deletions(-)
 create mode 100644 packages/email/emails/unassigned-items-notification.tsx
 create mode 100644 packages/email/lib/unassigned-items-notification.ts

diff --git a/apps/api/src/auth/hybrid-auth.guard.ts b/apps/api/src/auth/hybrid-auth.guard.ts
index 0e027e873..91441bc71 100644
--- a/apps/api/src/auth/hybrid-auth.guard.ts
+++ b/apps/api/src/auth/hybrid-auth.guard.ts
@@ -232,6 +232,7 @@ export class HybridAuthGuard implements CanActivate {
         where: {
           userId,
           organizationId,
+          deactivated: false,
         },
         select: {
           id: true,
diff --git a/apps/api/src/comments/comments.service.ts b/apps/api/src/comments/comments.service.ts
index 7d245dd8b..864ce6774 100644
--- a/apps/api/src/comments/comments.service.ts
+++ b/apps/api/src/comments/comments.service.ts
@@ -116,6 +116,7 @@ export class CommentsService {
               name: comment.author.user.name,
               email: comment.author.user.email,
               image: comment.author.user.image,
+              deactivated: comment.author.deactivated,
             },
             attachments,
             createdAt: comment.createdAt,
@@ -154,6 +155,7 @@ export class CommentsService {
         where: {
           userId,
           organizationId,
+          deactivated: false,
         },
         include: {
           user: true,
@@ -211,6 +213,7 @@ export class CommentsService {
           name: member.user.name,
           email: member.user.email,
           image: member.user.image,
+          deactivated: member.deactivated,
         },
         attachments: result.attachments,
         createdAt: result.comment.createdAt,
@@ -284,6 +287,7 @@ export class CommentsService {
           name: existingComment.author.user.name,
           email: existingComment.author.user.email,
           image: existingComment.author.user.image,
+          deactivated: existingComment.author.deactivated,
         },
         attachments,
         createdAt: updatedComment.createdAt,
diff --git a/apps/api/src/comments/dto/comment-responses.dto.ts b/apps/api/src/comments/dto/comment-responses.dto.ts
index e98f366ce..dcf7ddcd0 100644
--- a/apps/api/src/comments/dto/comment-responses.dto.ts
+++ b/apps/api/src/comments/dto/comment-responses.dto.ts
@@ -89,6 +89,13 @@ export class AuthorResponseDto {
     nullable: true,
   })
   image: string | null;
+
+  @ApiProperty({
+    description: 'Whether the user is deactivated',
+    example: false,
+    nullable: true,
+  })
+  deactivated: boolean;
 }
 
 export class CommentResponseDto {
diff --git a/apps/api/src/devices/devices.service.ts b/apps/api/src/devices/devices.service.ts
index 0bbaa4307..0d977c9f0 100644
--- a/apps/api/src/devices/devices.service.ts
+++ b/apps/api/src/devices/devices.service.ts
@@ -97,6 +97,7 @@ export class DevicesService {
         where: {
           id: memberId,
           organizationId: organizationId,
+          deactivated: false,
         },
         select: {
           id: true,
@@ -165,6 +166,7 @@ export class DevicesService {
         where: {
           id: memberId,
           organizationId: organizationId,
+          deactivated: false,
         },
         select: {
           id: true,
diff --git a/apps/api/src/people/utils/member-queries.ts b/apps/api/src/people/utils/member-queries.ts
index 0985195c5..37c019e65 100644
--- a/apps/api/src/people/utils/member-queries.ts
+++ b/apps/api/src/people/utils/member-queries.ts
@@ -40,7 +40,7 @@ export class MemberQueries {
     organizationId: string,
   ): Promise<PeopleResponseDto[]> {
     return db.member.findMany({
-      where: { organizationId },
+      where: { organizationId, deactivated: false },
       select: this.MEMBER_SELECT,
       orderBy: { createdAt: 'desc' },
     });
diff --git a/apps/api/src/people/utils/member-validator.ts b/apps/api/src/people/utils/member-validator.ts
index 1c678c63f..8236990ae 100644
--- a/apps/api/src/people/utils/member-validator.ts
+++ b/apps/api/src/people/utils/member-validator.ts
@@ -47,6 +47,7 @@ export class MemberValidator {
       where: {
         id: memberId,
         organizationId,
+        deactivated: false,
       },
       select: { id: true, userId: true },
     });
@@ -71,6 +72,7 @@ export class MemberValidator {
     const whereClause: any = {
       userId,
       organizationId,
+      deactivated: false,
     };
 
     if (excludeMemberId) {
diff --git a/apps/app/src/actions/add-comment.ts b/apps/app/src/actions/add-comment.ts
index 40a92dbf7..0ef626f17 100644
--- a/apps/app/src/actions/add-comment.ts
+++ b/apps/app/src/actions/add-comment.ts
@@ -38,6 +38,7 @@ export const addCommentAction = authActionClient
         where: {
           userId: session.userId,
           organizationId: session.activeOrganizationId,
+          deactivated: false,
         },
       });
 
diff --git a/apps/app/src/actions/change-organization.ts b/apps/app/src/actions/change-organization.ts
index 32e768bb0..9dc48ea53 100644
--- a/apps/app/src/actions/change-organization.ts
+++ b/apps/app/src/actions/change-organization.ts
@@ -28,6 +28,7 @@ export const changeOrganizationAction = authActionClient
       where: {
         userId: user.id,
         organizationId,
+        deactivated: false,
       },
     });
 
diff --git a/apps/app/src/actions/organization/accept-invitation.ts b/apps/app/src/actions/organization/accept-invitation.ts
index 78e0bf7ac..a507fbf6d 100644
--- a/apps/app/src/actions/organization/accept-invitation.ts
+++ b/apps/app/src/actions/organization/accept-invitation.ts
@@ -69,6 +69,7 @@ export const completeInvitation = authActionClientWithoutOrg
           where: {
             userId: user.id,
             organizationId: invitation.organizationId,
+            deactivated: false,
           },
         });
 
diff --git a/apps/app/src/actions/organization/get-organization-users-action.ts b/apps/app/src/actions/organization/get-organization-users-action.ts
index dcd33e6a8..aaa9d2e49 100644
--- a/apps/app/src/actions/organization/get-organization-users-action.ts
+++ b/apps/app/src/actions/organization/get-organization-users-action.ts
@@ -26,6 +26,7 @@ export const getOrganizationUsersAction = authActionClient
         const users = await db.member.findMany({
           where: {
             organizationId: ctx.session.activeOrganizationId,
+            deactivated: false,
           },
           select: {
             user: {
diff --git a/apps/app/src/actions/policies/accept-requested-policy-changes.ts b/apps/app/src/actions/policies/accept-requested-policy-changes.ts
index f60e30acc..a3d716756 100644
--- a/apps/app/src/actions/policies/accept-requested-policy-changes.ts
+++ b/apps/app/src/actions/policies/accept-requested-policy-changes.ts
@@ -82,6 +82,7 @@ export const acceptRequestedPolicyChangesAction = authActionClient
         where: {
           organizationId: session.activeOrganizationId,
           isActive: true,
+          deactivated: false,
         },
         include: {
           user: true,
@@ -131,6 +132,7 @@ export const acceptRequestedPolicyChangesAction = authActionClient
           where: {
             userId: user.id,
             organizationId: session.activeOrganizationId,
+            deactivated: false,
           },
         });
 
diff --git a/apps/app/src/actions/policies/create-new-policy.ts b/apps/app/src/actions/policies/create-new-policy.ts
index 9f7e75a82..146528fb6 100644
--- a/apps/app/src/actions/policies/create-new-policy.ts
+++ b/apps/app/src/actions/policies/create-new-policy.ts
@@ -39,6 +39,7 @@ export const createPolicyAction = authActionClient
       where: {
         userId: user.id,
         organizationId: activeOrganizationId,
+        deactivated: false,
       },
     });
 
diff --git a/apps/app/src/actions/policies/deny-requested-policy-changes.ts b/apps/app/src/actions/policies/deny-requested-policy-changes.ts
index 5c937edbe..a61dcec38 100644
--- a/apps/app/src/actions/policies/deny-requested-policy-changes.ts
+++ b/apps/app/src/actions/policies/deny-requested-policy-changes.ts
@@ -68,6 +68,7 @@ export const denyRequestedPolicyChangesAction = authActionClient
           where: {
             userId: user.id,
             organizationId: session.activeOrganizationId,
+            deactivated: false,
           },
         });
 
diff --git a/apps/app/src/actions/policies/publish-all.ts b/apps/app/src/actions/policies/publish-all.ts
index 8ce0cdf79..8a17e6c51 100644
--- a/apps/app/src/actions/policies/publish-all.ts
+++ b/apps/app/src/actions/policies/publish-all.ts
@@ -41,6 +41,7 @@ export const publishAllPoliciesAction = authActionClient
       where: {
         userId: user.id,
         organizationId: parsedInput.organizationId,
+        deactivated: false,
       },
     });
 
@@ -104,6 +105,7 @@ export const publishAllPoliciesAction = authActionClient
         where: {
           organizationId: parsedInput.organizationId,
           isActive: true,
+          deactivated: false,          
           OR: [
             { role: { contains: Role.employee } },
             { role: { contains: Role.contractor } },
diff --git a/apps/app/src/actions/safe-action.ts b/apps/app/src/actions/safe-action.ts
index 656010ebb..49280a4ea 100644
--- a/apps/app/src/actions/safe-action.ts
+++ b/apps/app/src/actions/safe-action.ts
@@ -231,6 +231,7 @@ export const authWithOrgAccessClient = authActionClient.use(async ({ next, clien
     where: {
       userId: ctx.user.id,
       organizationId,
+      deactivated: false,
     },
   });
 
diff --git a/apps/app/src/app/(app)/[orgId]/frameworks/page.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/page.tsx
index d26062890..7c87b44eb 100644
--- a/apps/app/src/app/(app)/[orgId]/frameworks/page.tsx
+++ b/apps/app/src/app/(app)/[orgId]/frameworks/page.tsx
@@ -39,6 +39,7 @@ export default async function DashboardPage({ params }: { params: Promise<{ orgI
     where: {
       userId: session.user.id,
       organizationId,
+      deactivated: false,
     },
   });
 
diff --git a/apps/app/src/app/(app)/[orgId]/layout.tsx b/apps/app/src/app/(app)/[orgId]/layout.tsx
index c54c4ac87..50cc6268c 100644
--- a/apps/app/src/app/(app)/[orgId]/layout.tsx
+++ b/apps/app/src/app/(app)/[orgId]/layout.tsx
@@ -56,6 +56,7 @@ export default async function Layout({
     where: {
       userId: session.user.id,
       organizationId: requestedOrgId,
+      deactivated: false,
     },
   });
 
diff --git a/apps/app/src/app/(app)/[orgId]/people/all/actions/addEmployeeWithoutInvite.ts b/apps/app/src/app/(app)/[orgId]/people/all/actions/addEmployeeWithoutInvite.ts
index 5ee3eae37..66d1da59d 100644
--- a/apps/app/src/app/(app)/[orgId]/people/all/actions/addEmployeeWithoutInvite.ts
+++ b/apps/app/src/app/(app)/[orgId]/people/all/actions/addEmployeeWithoutInvite.ts
@@ -25,6 +25,7 @@ export const addEmployeeWithoutInvite = async ({
       where: {
         organizationId: organizationId,
         userId: currentUserId,
+        deactivated: false,
       },
     });
 
@@ -57,16 +58,45 @@ export const addEmployeeWithoutInvite = async ({
       userId = newUser.id;
     }
 
-    const member = await auth.api.addMember({
-      body: {
-        userId: existingUser?.id ?? userId,
+    const finalUserId = existingUser?.id ?? userId;
+
+    // Check if there's an existing member (including deactivated ones) for this user and organization
+    const existingMember = await db.member.findFirst({
+      where: {
+        userId: finalUserId,
         organizationId,
-        role: roles, // Auth API expects role or role array
       },
     });
 
-    // Create training video completion entries for the new member
-    if (member?.id) {
+    let member;
+    if (existingMember) {
+      // If member exists but is deactivated, reactivate it and update roles
+      if (existingMember.deactivated) {
+        const roleString = roles.sort().join(',');
+        member = await db.member.update({
+          where: { id: existingMember.id },
+          data: {
+            deactivated: false,
+            role: roleString,
+          },
+        });
+      } else {
+        // Member already exists and is active, return existing member
+        member = existingMember;
+      }
+    } else {
+      // No existing member, create a new one
+      member = await auth.api.addMember({
+        body: {
+          userId: finalUserId,
+          organizationId,
+          role: roles, // Auth API expects role or role array
+        },
+      });
+    }
+
+    // Create training video completion entries for the new member (only if member was just created/reactivated)
+    if (member?.id && !existingMember) {
       await createTrainingVideoEntries(member.id);
     }
 
diff --git a/apps/app/src/app/(app)/[orgId]/people/all/actions/removeMember.ts b/apps/app/src/app/(app)/[orgId]/people/all/actions/removeMember.ts
index a734a9124..822eef671 100644
--- a/apps/app/src/app/(app)/[orgId]/people/all/actions/removeMember.ts
+++ b/apps/app/src/app/(app)/[orgId]/people/all/actions/removeMember.ts
@@ -6,6 +6,7 @@ import { z } from 'zod';
 // Adjust safe-action import for colocalized structure
 import { authActionClient } from '@/actions/safe-action';
 import type { ActionResponse } from '@/actions/types';
+import { sendUnassignedItemsNotificationEmail, type UnassignedItem } from '@comp/email';
 
 const removeMemberSchema = z.object({
   memberId: z.string(),
@@ -36,6 +37,7 @@ export const removeMember = authActionClient
         where: {
           organizationId: ctx.session.activeOrganizationId,
           userId: ctx.user.id,
+          deactivated: false,
         },
       });
 
@@ -55,6 +57,9 @@ export const removeMember = authActionClient
           id: memberId,
           organizationId: ctx.session.activeOrganizationId,
         },
+        include: {
+          user: true,
+        },
       });
 
       if (!targetMember) {
@@ -80,11 +85,148 @@ export const removeMember = authActionClient
         };
       }
 
-      // Remove the member
-      await db.member.delete({
+      // Get organization name
+      const organization = await db.organization.findUnique({
+        where: {
+          id: ctx.session.activeOrganizationId,
+        },
+        select: {
+          name: true,
+        },
+      });
+
+      // Check for assignments and collect unassigned items
+      const unassignedItems: UnassignedItem[] = [];
+
+      // Check tasks
+      const assignedTasks = await db.task.findMany({
+        where: {
+          assigneeId: memberId,
+          organizationId: ctx.session.activeOrganizationId,
+        },
+        select: {
+          id: true,
+          title: true,
+        },
+      });
+
+      for (const task of assignedTasks) {
+        unassignedItems.push({
+          type: 'task',
+          id: task.id,
+          name: task.title,
+        });
+      }
+
+      // Check policies
+      const assignedPolicies = await db.policy.findMany({
+        where: {
+          assigneeId: memberId,
+          organizationId: ctx.session.activeOrganizationId,
+        },
+        select: {
+          id: true,
+          name: true,
+        },
+      });
+
+      for (const policy of assignedPolicies) {
+        unassignedItems.push({
+          type: 'policy',
+          id: policy.id,
+          name: policy.name,
+        });
+      }
+
+      // Check risks
+      const assignedRisks = await db.risk.findMany({
+        where: {
+          assigneeId: memberId,
+          organizationId: ctx.session.activeOrganizationId,
+        },
+        select: {
+          id: true,
+          title: true,
+        },
+      });
+
+      for (const risk of assignedRisks) {
+        unassignedItems.push({
+          type: 'risk',
+          id: risk.id,
+          name: risk.title,
+        });
+      }
+
+      // Check vendors
+      const assignedVendors = await db.vendor.findMany({
+        where: {
+          assigneeId: memberId,
+          organizationId: ctx.session.activeOrganizationId,
+        },
+        select: {
+          id: true,
+          name: true,
+        },
+      });
+
+      for (const vendor of assignedVendors) {
+        unassignedItems.push({
+          type: 'vendor',
+          id: vendor.id,
+          name: vendor.name,
+        });
+      }
+
+      // Clear all assignments
+      await Promise.all([
+        db.task.updateMany({
+          where: {
+            assigneeId: memberId,
+            organizationId: ctx.session.activeOrganizationId,
+          },
+          data: {
+            assigneeId: null,
+          },
+        }),
+        db.policy.updateMany({
+          where: {
+            assigneeId: memberId,
+            organizationId: ctx.session.activeOrganizationId,
+          },
+          data: {
+            assigneeId: null,
+          },
+        }),
+        db.risk.updateMany({
+          where: {
+            assigneeId: memberId,
+            organizationId: ctx.session.activeOrganizationId,
+          },
+          data: {
+            assigneeId: null,
+          },
+        }),
+        db.vendor.updateMany({
+          where: {
+            assigneeId: memberId,
+            organizationId: ctx.session.activeOrganizationId,
+          },
+          data: {
+            assigneeId: null,
+          },
+        }),
+      ]);
+
+      // Mark the member as deactivated instead of deleting
+      await db.member.update({
         where: {
           id: memberId,
         },
+        data: {
+          deactivated: true,
+          isActive: false,
+        },
       });
 
       // Consider if deleting sessions is still desired here
@@ -94,6 +236,34 @@ export const removeMember = authActionClient
         },
       });
 
+      // Notify admins if there are unassigned items
+      if (unassignedItems.length > 0 && organization) {
+        const owner = await db.member.findFirst({
+          where: {
+            organizationId: ctx.session.activeOrganizationId,
+            role: { contains: 'owner' },
+            deactivated: false,
+          },
+          include: {
+            user: true,
+          },
+        });
+
+        const removedMemberName = targetMember.user.name || targetMember.user.email || 'Member';
+
+        if (owner) {
+          // Send email to the org owner
+          sendUnassignedItemsNotificationEmail({
+            email: owner.user.email,
+            userName: owner.user.name || owner.user.email || 'Owner',
+            organizationName: organization.name,
+            organizationId: ctx.session.activeOrganizationId,
+            removedMemberName,
+            unassignedItems,
+          });
+        }
+      }
+
       revalidatePath(`/${ctx.session.activeOrganizationId}/settings/users`);
       revalidateTag(`user_${ctx.user.id}`);
 
diff --git a/apps/app/src/app/(app)/[orgId]/people/all/actions/revokeInvitation.ts b/apps/app/src/app/(app)/[orgId]/people/all/actions/revokeInvitation.ts
index 8558f1805..d826135a4 100644
--- a/apps/app/src/app/(app)/[orgId]/people/all/actions/revokeInvitation.ts
+++ b/apps/app/src/app/(app)/[orgId]/people/all/actions/revokeInvitation.ts
@@ -37,6 +37,7 @@ export const revokeInvitation = authActionClient
         where: {
           organizationId: ctx.session.activeOrganizationId,
           userId: ctx.user.id,
+          deactivated: false,
         },
       });
 
diff --git a/apps/app/src/app/(app)/[orgId]/people/all/components/TeamMembers.tsx b/apps/app/src/app/(app)/[orgId]/people/all/components/TeamMembers.tsx
index fdeff7173..ed20bda8b 100644
--- a/apps/app/src/app/(app)/[orgId]/people/all/components/TeamMembers.tsx
+++ b/apps/app/src/app/(app)/[orgId]/people/all/components/TeamMembers.tsx
@@ -45,6 +45,7 @@ export async function TeamMembers() {
     const fetchedMembers = await db.member.findMany({
       where: {
         organizationId: organizationId,
+        deactivated: false,
       },
       include: {
         user: true,
diff --git a/apps/app/src/app/(app)/[orgId]/people/all/components/TeamMembersClient.tsx b/apps/app/src/app/(app)/[orgId]/people/all/components/TeamMembersClient.tsx
index 358470b3a..545542d8f 100644
--- a/apps/app/src/app/(app)/[orgId]/people/all/components/TeamMembersClient.tsx
+++ b/apps/app/src/app/(app)/[orgId]/people/all/components/TeamMembersClient.tsx
@@ -140,7 +140,7 @@ export function TeamMembersClient({
 
   const handleRemoveMember = async (memberId: string) => {
     const result = await removeMemberAction({ memberId });
-    if (result?.data) {
+    if (result?.data?.success) {
       // Success case
       toast.success('has been removed from the organization');
       router.refresh(); // Add client-side refresh as well
diff --git a/apps/app/src/app/(app)/[orgId]/people/dashboard/components/EmployeesOverview.tsx b/apps/app/src/app/(app)/[orgId]/people/dashboard/components/EmployeesOverview.tsx
index 09a5cd1c5..ca9537d3c 100644
--- a/apps/app/src/app/(app)/[orgId]/people/dashboard/components/EmployeesOverview.tsx
+++ b/apps/app/src/app/(app)/[orgId]/people/dashboard/components/EmployeesOverview.tsx
@@ -41,6 +41,7 @@ export async function EmployeesOverview() {
     const fetchedMembers = await db.member.findMany({
       where: {
         organizationId: organizationId,
+        deactivated: false,
       },
       include: {
         user: true,
diff --git a/apps/app/src/app/(app)/[orgId]/people/devices/data/index.ts b/apps/app/src/app/(app)/[orgId]/people/devices/data/index.ts
index 3ec1d54f5..965348591 100644
--- a/apps/app/src/app/(app)/[orgId]/people/devices/data/index.ts
+++ b/apps/app/src/app/(app)/[orgId]/people/devices/data/index.ts
@@ -23,6 +23,7 @@ export const getEmployeeDevices: () => Promise<Host[] | null> = async () => {
   const employees = await db.member.findMany({
     where: {
       organizationId,
+      deactivated: false,
     },
   });
 
diff --git a/apps/app/src/app/(app)/[orgId]/people/layout.tsx b/apps/app/src/app/(app)/[orgId]/people/layout.tsx
index 149b80caf..44640914e 100644
--- a/apps/app/src/app/(app)/[orgId]/people/layout.tsx
+++ b/apps/app/src/app/(app)/[orgId]/people/layout.tsx
@@ -18,6 +18,7 @@ export default async function Layout({ children }: { children: React.ReactNode }
   const allMembers = await db.member.findMany({
     where: {
       organizationId: orgId,
+      deactivated: false,
     },
   });
 
diff --git a/apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/RecentAuditLogs.tsx b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/RecentAuditLogs.tsx
index f9af8cb7b..0a78bb0cd 100644
--- a/apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/RecentAuditLogs.tsx
+++ b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/RecentAuditLogs.tsx
@@ -3,10 +3,17 @@ import { Badge } from '@comp/ui/badge';
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@comp/ui/card';
 import { cn } from '@comp/ui/cn';
 import { ScrollArea } from '@comp/ui/scroll-area';
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from '@comp/ui/tooltip';
 import { AuditLog, AuditLogEntityType } from '@db';
 import { format } from 'date-fns';
 import {
   ActivityIcon,
+  AlertTriangle,
   CalendarIcon,
   ClockIcon,
   FileIcon,
@@ -90,6 +97,7 @@ const getUserInfo = (log: AuditLogWithRelations) => {
       name: log.user.name,
       email: log.user.email,
       avatarUrl: log.user.image || undefined,
+      deactivated: log.member?.deactivated || false,
     };
   }
 
@@ -98,6 +106,7 @@ const getUserInfo = (log: AuditLogWithRelations) => {
     name: undefined,
     email: undefined,
     avatarUrl: undefined,
+    deactivated: false,
   };
 };
 
@@ -110,10 +119,26 @@ const LogItem = ({ log }: { log: AuditLogWithRelations }) => {
     <Card className="border-0 border-none">
       <CardContent>
         <div className="flex items-start gap-4">
-          <Avatar className="h-10 w-10">
-            <AvatarImage src={userInfo.avatarUrl || ''} alt={userInfo.name || 'User'} />
-            <AvatarFallback>{getInitials(userInfo.name)}</AvatarFallback>
-          </Avatar>
+          <div className="relative">
+            <Avatar className="h-10 w-10">
+              <AvatarImage src={userInfo.avatarUrl || ''} alt={userInfo.name || 'User'} />
+              <AvatarFallback>{getInitials(userInfo.name)}</AvatarFallback>
+            </Avatar>
+            {userInfo.deactivated && (
+              <TooltipProvider>
+                <Tooltip>
+                  <TooltipTrigger asChild>
+                    <div className="absolute -bottom-0.5 -right-0.5 rounded-full">
+                      <AlertTriangle className="h-3.5 w-3.5 text-red-500 fill-yellow-400" />
+                    </div>
+                  </TooltipTrigger>
+                  <TooltipContent>
+                    <p>This user is deactivated.</p>
+                  </TooltipContent>
+                </Tooltip>
+              </TooltipProvider>
+            )}
+          </div>
 
           <div className="flex-1 space-y-2">
             <div className="flex items-center justify-between">
diff --git a/apps/app/src/app/(app)/[orgId]/policies/[policyId]/data/index.ts b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/data/index.ts
index 314c0cb43..2c9bb3a50 100644
--- a/apps/app/src/app/(app)/[orgId]/policies/[policyId]/data/index.ts
+++ b/apps/app/src/app/(app)/[orgId]/policies/[policyId]/data/index.ts
@@ -137,6 +137,7 @@ export const getAssignees = async () => {
       role: {
         notIn: ['employee', 'contractor'],
       },
+      deactivated: false,
     },
     include: {
       user: true,
@@ -193,6 +194,7 @@ export const getComments = async (policyId: string): Promise<CommentWithAuthor[]
           name: comment.author.user.name,
           email: comment.author.user.email,
           image: comment.author.user.image,
+          deactivated: comment.author.deactivated,
         },
         attachments: attachments.map((att) => ({
           id: att.id,
diff --git a/apps/app/src/app/(app)/[orgId]/risk/(overview)/page.tsx b/apps/app/src/app/(app)/[orgId]/risk/(overview)/page.tsx
index 7273c18c7..175ce7e03 100644
--- a/apps/app/src/app/(app)/[orgId]/risk/(overview)/page.tsx
+++ b/apps/app/src/app/(app)/[orgId]/risk/(overview)/page.tsx
@@ -116,6 +116,7 @@ const getAssignees = cache(async () => {
     where: {
       organizationId: session.session.activeOrganizationId,
       isActive: true,
+      deactivated: false,
       role: {
         notIn: ['employee', 'contractor'],
       },
diff --git a/apps/app/src/app/(app)/[orgId]/risk/[riskId]/page.tsx b/apps/app/src/app/(app)/[orgId]/risk/[riskId]/page.tsx
index 7ad8e795e..5fe1a4560 100644
--- a/apps/app/src/app/(app)/[orgId]/risk/[riskId]/page.tsx
+++ b/apps/app/src/app/(app)/[orgId]/risk/[riskId]/page.tsx
@@ -91,6 +91,7 @@ const getAssignees = cache(async () => {
       role: {
         notIn: ['employee', 'contractor'],
       },
+      deactivated: false,
     },
     include: {
       user: true,
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/page.tsx b/apps/app/src/app/(app)/[orgId]/tasks/page.tsx
index 66d9a544f..d14e25b5c 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/page.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/page.tsx
@@ -101,6 +101,7 @@ const getMembersWithMetadata = async () => {
       role: {
         notIn: [Role.employee, Role.auditor, Role.contractor],
       },
+      deactivated: false,
     },
     include: {
       user: true,
diff --git a/apps/app/src/app/(app)/[orgId]/vendors/(overview)/actions/deleteVendor.ts b/apps/app/src/app/(app)/[orgId]/vendors/(overview)/actions/deleteVendor.ts
index 51ef230c3..3ce5bb4c2 100644
--- a/apps/app/src/app/(app)/[orgId]/vendors/(overview)/actions/deleteVendor.ts
+++ b/apps/app/src/app/(app)/[orgId]/vendors/(overview)/actions/deleteVendor.ts
@@ -34,6 +34,7 @@ export const deleteVendor = authActionClient
         where: {
           organizationId: ctx.session.activeOrganizationId,
           userId: ctx.user.id,
+          deactivated: false,
         },
       });
 
diff --git a/apps/app/src/app/(app)/[orgId]/vendors/(overview)/data/queries.ts b/apps/app/src/app/(app)/[orgId]/vendors/(overview)/data/queries.ts
index a50090586..504a0c9e3 100644
--- a/apps/app/src/app/(app)/[orgId]/vendors/(overview)/data/queries.ts
+++ b/apps/app/src/app/(app)/[orgId]/vendors/(overview)/data/queries.ts
@@ -59,6 +59,7 @@ export const getAssignees = cache(async (orgId: string): Promise<GetAssigneesRes
       role: {
         notIn: ['employee', 'contractor'],
       },
+      deactivated: false,
     },
     include: {
       user: true,
diff --git a/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/page.tsx b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/page.tsx
index 1d03a7c75..ac331662d 100644
--- a/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/page.tsx
+++ b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/page.tsx
@@ -107,6 +107,7 @@ const getAssignees = cache(async () => {
       role: {
         notIn: ['employee', 'contractor'],
       },
+      deactivated: false,
     },
     include: {
       user: true,
diff --git a/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/tasks/[taskId]/page.tsx b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/tasks/[taskId]/page.tsx
index 8d4239106..a31c1185f 100644
--- a/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/tasks/[taskId]/page.tsx
+++ b/apps/app/src/app/(app)/[orgId]/vendors/[vendorId]/tasks/[taskId]/page.tsx
@@ -50,6 +50,7 @@ export default async function TaskPage({ params }: PageProps) {
         role: {
           notIn: ['employee', 'contractor'],
         },
+        deactivated: false,
       },
       include: {
         user: true,
diff --git a/apps/app/src/app/(app)/[orgId]/vendors/backup-overview/layout.tsx b/apps/app/src/app/(app)/[orgId]/vendors/backup-overview/layout.tsx
index e7317863d..15f8156ef 100644
--- a/apps/app/src/app/(app)/[orgId]/vendors/backup-overview/layout.tsx
+++ b/apps/app/src/app/(app)/[orgId]/vendors/backup-overview/layout.tsx
@@ -96,6 +96,7 @@ const getAssignees = cache(async () => {
       role: {
         notIn: ['employee', 'contractor'],
       },
+      deactivated: false,
     },
     include: {
       user: true,
diff --git a/apps/app/src/app/(app)/onboarding/actions/complete-onboarding.ts b/apps/app/src/app/(app)/onboarding/actions/complete-onboarding.ts
index bbe85dc1f..42dd4b20d 100644
--- a/apps/app/src/app/(app)/onboarding/actions/complete-onboarding.ts
+++ b/apps/app/src/app/(app)/onboarding/actions/complete-onboarding.ts
@@ -56,6 +56,7 @@ export const completeOnboarding = authActionClient
         where: {
           userId: ctx.user.id,
           organizationId: parsedInput.organizationId,
+          deactivated: false,
         },
       });
 
diff --git a/apps/app/src/app/(app)/upgrade/[orgId]/page.tsx b/apps/app/src/app/(app)/upgrade/[orgId]/page.tsx
index 2abf813fe..db8841713 100644
--- a/apps/app/src/app/(app)/upgrade/[orgId]/page.tsx
+++ b/apps/app/src/app/(app)/upgrade/[orgId]/page.tsx
@@ -28,6 +28,7 @@ export default async function UpgradePage({ params }: PageProps) {
     where: {
       organizationId: orgId,
       userId: authSession.user.id,
+      deactivated: false,
     },
     include: {
       organization: true,
diff --git a/apps/app/src/app/api/secrets/[id]/route.ts b/apps/app/src/app/api/secrets/[id]/route.ts
index 9871f6620..6f98f3b0e 100644
--- a/apps/app/src/app/api/secrets/[id]/route.ts
+++ b/apps/app/src/app/api/secrets/[id]/route.ts
@@ -79,6 +79,7 @@ export async function PUT(request: NextRequest, { params }: { params: Promise<{
       where: {
         organizationId: validatedData.organizationId,
         userId: session.user.id,
+        deactivated: false,
       },
     });
 
@@ -175,6 +176,7 @@ export async function DELETE(
       where: {
         organizationId,
         userId: session.user.id,
+        deactivated: false,
       },
     });
 
diff --git a/apps/app/src/app/api/secrets/route.ts b/apps/app/src/app/api/secrets/route.ts
index 8cbcce324..ea1215a54 100644
--- a/apps/app/src/app/api/secrets/route.ts
+++ b/apps/app/src/app/api/secrets/route.ts
@@ -80,6 +80,7 @@ export async function POST(request: NextRequest) {
       where: {
         organizationId: validatedData.organizationId,
         userId: session.user.id,
+        deactivated: false,
       },
     });
 
diff --git a/apps/app/src/app/page.tsx b/apps/app/src/app/page.tsx
index c83d58de7..57170a935 100644
--- a/apps/app/src/app/page.tsx
+++ b/apps/app/src/app/page.tsx
@@ -69,6 +69,7 @@ export default async function RootPage({
     where: {
       organizationId: orgId,
       userId: session.user.id,
+      deactivated: false,
     },
   });
 
diff --git a/apps/app/src/components/comments/CommentItem.tsx b/apps/app/src/components/comments/CommentItem.tsx
index cdadb4746..8b15b718b 100644
--- a/apps/app/src/components/comments/CommentItem.tsx
+++ b/apps/app/src/components/comments/CommentItem.tsx
@@ -19,7 +19,21 @@ import {
   DropdownMenuTrigger,
 } from '@comp/ui/dropdown-menu';
 import { Textarea } from '@comp/ui/textarea';
-import { FileIcon, FileText, ImageIcon, MoreHorizontal, Pencil, Trash2 } from 'lucide-react';
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from '@comp/ui/tooltip';
+import {
+  AlertTriangle,
+  FileIcon,
+  FileText,
+  ImageIcon,
+  MoreHorizontal,
+  Pencil,
+  Trash2,
+} from 'lucide-react';
 import type React from 'react';
 import { useState } from 'react';
 import { toast } from 'sonner';
@@ -158,15 +172,31 @@ export function CommentItem({ comment, refreshComments }: CommentItemProps) {
   return (
     <>
       <div className="flex items-start gap-3 p-4 rounded-lg border border-border bg-card hover:shadow-sm transition-all group">
-        <Avatar className="h-8 w-8 border border-border">
-          <AvatarImage
-            src={comment.author.image || getGravatarUrl(comment.author.email)}
-            alt={comment.author.name ?? 'User'}
-          />
-          <AvatarFallback className="text-xs bg-muted">
-            {comment.author.name?.charAt(0).toUpperCase() ?? '?'}
-          </AvatarFallback>
-        </Avatar>
+        <div className="relative">
+          <Avatar className="h-8 w-8 border border-border">
+            <AvatarImage
+              src={comment.author.image || getGravatarUrl(comment.author.email)}
+              alt={comment.author.name ?? 'User'}
+            />
+            <AvatarFallback className="text-xs bg-muted">
+              {comment.author.name?.charAt(0).toUpperCase() ?? '?'}
+            </AvatarFallback>
+          </Avatar>
+          {comment.author.deactivated && (
+            <TooltipProvider>
+              <Tooltip>
+                <TooltipTrigger asChild>
+                  <div className="absolute -bottom-0.5 -right-0.5 rounded-full">
+                    <AlertTriangle className="h-3.5 w-3.5 text-red-500 fill-yellow-400" />
+                  </div>
+                </TooltipTrigger>
+                <TooltipContent>
+                  <p>This user is deactivated.</p>
+                </TooltipContent>
+              </Tooltip>
+            </TooltipProvider>
+          )}
+        </div>
         <div className="flex-1 items-start space-y-2 text-sm">
           <div>
             <div className="mb-1 flex items-center justify-between gap-2">
diff --git a/apps/app/src/components/comments/Comments.tsx b/apps/app/src/components/comments/Comments.tsx
index fb040115b..ba49f19e4 100644
--- a/apps/app/src/components/comments/Comments.tsx
+++ b/apps/app/src/components/comments/Comments.tsx
@@ -14,6 +14,7 @@ export type CommentWithAuthor = {
     name: string;
     email: string;
     image: string | null;
+    deactivated: boolean;
   };
   attachments: Array<{
     id: string;
diff --git a/apps/app/src/hooks/use-comments-api.ts b/apps/app/src/hooks/use-comments-api.ts
index 715828287..dbab2e0dd 100644
--- a/apps/app/src/hooks/use-comments-api.ts
+++ b/apps/app/src/hooks/use-comments-api.ts
@@ -20,6 +20,7 @@ export interface Comment {
     name: string;
     email: string;
     image: string | null;
+    deactivated: boolean;
   };
   attachments: Array<{
     id: string;
@@ -175,6 +176,7 @@ export function useOptimisticComments(entityId: string, entityType: CommentEntit
           name: 'You', // Will be replaced with real author data
           email: '',
           image: null,
+          deactivated: false,
         },
         attachments: [], // Will be populated by real response
         createdAt: new Date().toISOString(),
diff --git a/apps/app/src/jobs/tasks/onboarding/backfill-training-videos-for-org.ts b/apps/app/src/jobs/tasks/onboarding/backfill-training-videos-for-org.ts
index 21828c0ea..2b805517c 100644
--- a/apps/app/src/jobs/tasks/onboarding/backfill-training-videos-for-org.ts
+++ b/apps/app/src/jobs/tasks/onboarding/backfill-training-videos-for-org.ts
@@ -15,6 +15,7 @@ export const backfillTrainingVideosForOrg = task({
       const members = await db.member.findMany({
         where: {
           organizationId: payload.organizationId,
+          deactivated: false,
         },
         select: {
           id: true,
diff --git a/apps/app/src/jobs/tasks/onboarding/onboard-organization-helpers.ts b/apps/app/src/jobs/tasks/onboarding/onboard-organization-helpers.ts
index d010b7f1c..0253120d5 100644
--- a/apps/app/src/jobs/tasks/onboarding/onboard-organization-helpers.ts
+++ b/apps/app/src/jobs/tasks/onboarding/onboard-organization-helpers.ts
@@ -273,6 +273,7 @@ export async function findCommentAuthor(organizationId: string) {
     where: {
       organizationId,
       OR: [{ role: { contains: 'owner' } }, { role: { contains: 'admin' } }],
+      deactivated: false,
     },
     orderBy: [
       { role: 'desc' }, // Prefer owner over admin
diff --git a/apps/app/src/jobs/tasks/onboarding/onboard-organization.ts b/apps/app/src/jobs/tasks/onboarding/onboard-organization.ts
index c7bc12638..f03ee3a71 100644
--- a/apps/app/src/jobs/tasks/onboarding/onboard-organization.ts
+++ b/apps/app/src/jobs/tasks/onboarding/onboard-organization.ts
@@ -79,6 +79,7 @@ export const onboardOrganization = task({
           role: {
             contains: 'owner',
           },
+          deactivated: false,
         },
       });
 
diff --git a/apps/portal/src/app/(app)/(home)/[orgId]/page.tsx b/apps/portal/src/app/(app)/(home)/[orgId]/page.tsx
index 79b16971c..06e715624 100644
--- a/apps/portal/src/app/(app)/(home)/[orgId]/page.tsx
+++ b/apps/portal/src/app/(app)/(home)/[orgId]/page.tsx
@@ -28,6 +28,7 @@ export default async function OrganizationPage({ params }: { params: Promise<{ o
         where: {
           userId: session.user.id,
           organizationId: orgId,
+          deactivated: false,
         },
         include: {
           user: true,
diff --git a/apps/portal/src/app/(app)/(home)/[orgId]/policy/[policyId]/page.tsx b/apps/portal/src/app/(app)/(home)/[orgId]/policy/[policyId]/page.tsx
index 6bec73ba3..54ed5cee5 100644
--- a/apps/portal/src/app/(app)/(home)/[orgId]/policy/[policyId]/page.tsx
+++ b/apps/portal/src/app/(app)/(home)/[orgId]/policy/[policyId]/page.tsx
@@ -43,6 +43,7 @@ export default async function PolicyPage({
     where: {
       userId: session.user.id,
       organizationId: orgId,
+      deactivated: false,
     },
   });
 
diff --git a/apps/portal/src/app/(app)/(home)/actions/getPolicyPdfUrl.ts b/apps/portal/src/app/(app)/(home)/actions/getPolicyPdfUrl.ts
index 092a45211..cd431dc53 100644
--- a/apps/portal/src/app/(app)/(home)/actions/getPolicyPdfUrl.ts
+++ b/apps/portal/src/app/(app)/(home)/actions/getPolicyPdfUrl.ts
@@ -35,7 +35,7 @@ export const getPolicyPdfUrl = authActionClient
       }
 
       const member = await db.member.findFirst({
-        where: { userId: user.id, organizationId: policy.organizationId },
+        where: { userId: user.id, organizationId: policy.organizationId, deactivated: false },
       });
 
       if (!member) {
diff --git a/apps/portal/src/app/(app)/(home)/actions/markPolicyAsCompleted.ts b/apps/portal/src/app/(app)/(home)/actions/markPolicyAsCompleted.ts
index 7439e294d..0c709cd6a 100644
--- a/apps/portal/src/app/(app)/(home)/actions/markPolicyAsCompleted.ts
+++ b/apps/portal/src/app/(app)/(home)/actions/markPolicyAsCompleted.ts
@@ -32,6 +32,7 @@ export const markPolicyAsCompleted = authActionClient
     const member = await db.member.findFirst({
       where: {
         userId: user.id,
+        deactivated: false,
       },
     });
 
diff --git a/apps/portal/src/app/(app)/(home)/actions/markVideoAsCompleted.ts b/apps/portal/src/app/(app)/(home)/actions/markVideoAsCompleted.ts
index 87e23f5bd..fa28b61a6 100644
--- a/apps/portal/src/app/(app)/(home)/actions/markVideoAsCompleted.ts
+++ b/apps/portal/src/app/(app)/(home)/actions/markVideoAsCompleted.ts
@@ -39,6 +39,7 @@ export const markVideoAsCompleted = authActionClient
       where: {
         userId: user.id,
         organizationId: organizationId,
+        deactivated: false,
       },
     });
 
diff --git a/apps/portal/src/app/api/download-agent/utils.ts b/apps/portal/src/app/api/download-agent/utils.ts
index 8f8c783e3..2ed0493c2 100644
--- a/apps/portal/src/app/api/download-agent/utils.ts
+++ b/apps/portal/src/app/api/download-agent/utils.ts
@@ -54,6 +54,7 @@ export async function validateMemberAndOrg(userId: string, orgId: string) {
     where: {
       userId,
       organizationId: orgId,
+      deactivated: false,
     },
   });
 
diff --git a/packages/docs/openapi.json b/packages/docs/openapi.json
index a1393b099..400a6859b 100644
--- a/packages/docs/openapi.json
+++ b/packages/docs/openapi.json
@@ -9908,13 +9908,20 @@
             "description": "User profile image URL",
             "example": "https://example.com/avatar.jpg",
             "nullable": true
+          },
+          "deactivated": {
+            "type": "boolean",
+            "description": "Whether the user is deactivated",
+            "example": false,
+            "nullable": true
           }
         },
         "required": [
           "id",
           "name",
           "email",
-          "image"
+          "image",
+          "deactivated"
         ]
       },
       "AttachmentMetadataDto": {
diff --git a/packages/email/emails/unassigned-items-notification.tsx b/packages/email/emails/unassigned-items-notification.tsx
new file mode 100644
index 000000000..a943b86e8
--- /dev/null
+++ b/packages/email/emails/unassigned-items-notification.tsx
@@ -0,0 +1,167 @@
+import {
+  Body,
+  Container,
+  Font,
+  Heading,
+  Html,
+  Link,
+  Section,
+  Preview,
+  Tailwind,
+  Text,
+} from '@react-email/components';
+import { Footer } from '../components/footer';
+import { Logo } from '../components/logo';
+
+interface UnassignedItem {
+  type: 'task' | 'policy' | 'risk' | 'vendor';
+  id: string;
+  name: string;
+}
+
+interface Props {
+  userName: string;
+  organizationName: string;
+  organizationId: string;
+  removedMemberName: string;
+  unassignedItems: UnassignedItem[];
+}
+
+export const UnassignedItemsNotificationEmail = ({
+  userName,
+  organizationName,
+  organizationId,
+  removedMemberName,
+  unassignedItems,
+}: Props) => {
+  const baseUrl = process.env.NEXT_PUBLIC_BETTER_AUTH_URL ?? 'https://app.trycomp.ai';
+  const link = `${baseUrl}/${organizationId}`;
+
+
+  const getItemTypeLabel = (type: UnassignedItem['type']) => {
+    switch (type) {
+      case 'task':
+        return 'Task';
+      case 'policy':
+        return 'Policy';
+      case 'risk':
+        return 'Risk';
+      case 'vendor':
+        return 'Vendor';
+    }
+  };
+
+  const getItemUrl = (item: UnassignedItem) => {
+    switch (item.type) {
+      case 'task':
+        return `${baseUrl}/${organizationId}/tasks/${item.id}`;
+      case 'policy':
+        return `${baseUrl}/${organizationId}/policies/${item.id}`;
+      case 'risk':
+        return `${baseUrl}/${organizationId}/risk/${item.id}`;
+      case 'vendor':
+        return `${baseUrl}/${organizationId}/vendors/${item.id}`;
+    }
+  };
+
+  const groupedItems = unassignedItems.reduce(
+    (acc, item) => {
+      if (!acc[item.type]) {
+        acc[item.type] = [];
+      }
+      acc[item.type].push(item);
+      return acc;
+    },
+    {} as Record<UnassignedItem['type'], UnassignedItem[]>,
+  );
+
+  return (
+    <Html>
+      <Tailwind>
+        <head>
+          <Font
+            fontFamily="Geist"
+            fallbackFontFamily="Helvetica"
+            webFont={{
+              url: 'https://app.trycomp.ai/fonts/geist/geist-sans-latin-400-normal.woff2',
+              format: 'woff2',
+            }}
+            fontWeight={400}
+            fontStyle="normal"
+          />
+
+          <Font
+            fontFamily="Geist"
+            fallbackFontFamily="Helvetica"
+            webFont={{
+              url: 'https://app.trycomp.ai/fonts/geist/geist-sans-latin-500-normal.woff2',
+              format: 'woff2',
+            }}
+            fontWeight={500}
+            fontStyle="normal"
+          />
+        </head>
+
+        <Preview>Member removed - items require reassignment</Preview>
+
+        <Body className="mx-auto my-auto bg-[#fff] font-sans">
+          <Container
+            className="mx-auto my-[40px] max-w-[600px] border-transparent p-[20px] md:border-[#E8E7E1]"
+            style={{ borderStyle: 'solid', borderWidth: 1 }}
+          >
+            <Logo />
+            <Heading className="mx-0 my-[30px] p-0 text-center text-[24px] font-normal text-[#121212]">
+              Member Removed - Items Require Reassignment
+            </Heading>
+
+            <Text className="text-[14px] leading-[24px] text-[#121212]">
+              Hi {userName},
+            </Text>
+
+            <Text className="text-[14px] leading-[24px] text-[#121212]">
+              <strong>{removedMemberName}</strong> has been removed from <strong>{organizationName}</strong>.
+              As a result, the following items that were previously assigned to them now require a new assignee:
+            </Text>
+
+            {Object.entries(groupedItems).map(([type, items]) => (
+              <Section key={type} className="my-[12px]">
+                <Text className="text-[16px] font-medium text-[#121212] mb-[8px] mt-0">
+                  {getItemTypeLabel(type as UnassignedItem['type'])}s ({items.length})
+                </Text>
+                <ul className="list-disc pl-[12px]">
+                  {items.map((item) => (
+                    <li key={item.id} className="text-[14px] leading-[24px] text-[#121212]">
+                      <Link href={getItemUrl(item)} className="text-[#121212] underline">
+                        {item.name}
+                      </Link>
+                    </li>
+                  ))}
+                </ul>
+              </Section>
+            ))}
+
+            <Text className="text-[14px] leading-[24px] text-[#121212] mt-[24px]">
+              Please log in to assign these items to appropriate team members.
+            </Text>
+
+            <Section className="mt-[32px] mb-[42px] text-center">
+              <a
+                href={link}
+                className="text-primary border border-solid border-[#121212] bg-transparent px-6 py-3 text-center text-[14px] font-medium text-[#121212] no-underline inline-block"
+              >
+                View Organization
+              </a>
+            </Section>
+
+            <br />
+
+            <Footer />
+          </Container>
+        </Body>
+      </Tailwind>
+    </Html>
+  );
+};
+
+export default UnassignedItemsNotificationEmail;
+
diff --git a/packages/email/index.ts b/packages/email/index.ts
index 34515beef..3da48a183 100644
--- a/packages/email/index.ts
+++ b/packages/email/index.ts
@@ -6,6 +6,7 @@ export * from './emails/magic-link';
 export * from './emails/marketing/welcome';
 export * from './emails/otp';
 export * from './emails/policy-notification';
+export * from './emails/unassigned-items-notification';
 export * from './emails/waitlist';
 
 // Email sending functions
@@ -14,5 +15,6 @@ export * from './lib/invite-member';
 export * from './lib/magic-link';
 export * from './lib/policy-notification';
 export * from './lib/resend';
+export * from './lib/unassigned-items-notification';
 export * from './lib/waitlist';
 export * from './lib/weekly-task-digest';
diff --git a/packages/email/lib/unassigned-items-notification.ts b/packages/email/lib/unassigned-items-notification.ts
new file mode 100644
index 000000000..7d1ee2b43
--- /dev/null
+++ b/packages/email/lib/unassigned-items-notification.ts
@@ -0,0 +1,58 @@
+import UnassignedItemsNotificationEmail from '../emails/unassigned-items-notification';
+import { sendEmail } from './resend';
+
+export interface UnassignedItem {
+  type: 'task' | 'policy' | 'risk' | 'vendor';
+  id: string;
+  name: string;
+}
+
+export const sendUnassignedItemsNotificationEmail = async (params: {
+  email: string;
+  userName: string;
+  organizationName: string;
+  organizationId: string;
+  removedMemberName: string;
+  unassignedItems: UnassignedItem[];
+}) => {
+  const {
+    email,
+    userName,
+    organizationName,
+    organizationId,
+    removedMemberName,
+    unassignedItems,
+  } = params;
+
+  if (unassignedItems.length === 0) {
+    return { success: true };
+  }
+
+  const subjectText = 'Member removed - items require reassignment';
+
+  try {
+    const sent = await sendEmail({
+      to: email,
+      subject: subjectText,
+      react: UnassignedItemsNotificationEmail({
+        userName,
+        organizationName,
+        organizationId,
+        removedMemberName,
+        unassignedItems,
+      }),
+      system: true, // Use system email address
+    });
+
+    if (!sent) {
+      console.error('Failed to send unassigned items notification email');
+      return { success: false };
+    }
+
+    return { success: true };
+  } catch (error) {
+    console.error('Error sending unassigned items notification email:', error);
+    return { success: false };
+  }
+};
+

From 672390534c59465d6af84c04d8854a342d7cc68a Mon Sep 17 00:00:00 2001
From: Mariano Fuentes <marfuen98@gmail.com>
Date: Mon, 24 Nov 2025 12:47:58 -0500
Subject: [PATCH 3/3] chore: set vendor questionnaire tasks to large-2x
 machines (#1820)

---
 apps/app/src/jobs/tasks/vendors/answer-question.ts               | 1 +
 apps/app/src/jobs/tasks/vendors/parse-questionnaire.ts           | 1 +
 .../src/jobs/tasks/vendors/vendor-questionnaire-orchestrator.ts  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/apps/app/src/jobs/tasks/vendors/answer-question.ts b/apps/app/src/jobs/tasks/vendors/answer-question.ts
index ab16fe0e8..ad8816956 100644
--- a/apps/app/src/jobs/tasks/vendors/answer-question.ts
+++ b/apps/app/src/jobs/tasks/vendors/answer-question.ts
@@ -4,6 +4,7 @@ import { generateAnswerWithRAG } from './answer-question-helpers';
 
 export const answerQuestion= task({
   id: 'answer-question',
+  machine: 'large-2x',
   retry: {
     maxAttempts: 3,
   },
diff --git a/apps/app/src/jobs/tasks/vendors/parse-questionnaire.ts b/apps/app/src/jobs/tasks/vendors/parse-questionnaire.ts
index 64118bc9d..e04949345 100644
--- a/apps/app/src/jobs/tasks/vendors/parse-questionnaire.ts
+++ b/apps/app/src/jobs/tasks/vendors/parse-questionnaire.ts
@@ -539,6 +539,7 @@ async function parseQuestionsAndAnswers(content: string): Promise<QuestionAnswer
 
 export const parseQuestionnaireTask = task({
   id: 'parse-questionnaire',
+  machine: 'large-2x',
   retry: {
     maxAttempts: 2,
   },
diff --git a/apps/app/src/jobs/tasks/vendors/vendor-questionnaire-orchestrator.ts b/apps/app/src/jobs/tasks/vendors/vendor-questionnaire-orchestrator.ts
index 4713ecba2..2310a78a4 100644
--- a/apps/app/src/jobs/tasks/vendors/vendor-questionnaire-orchestrator.ts
+++ b/apps/app/src/jobs/tasks/vendors/vendor-questionnaire-orchestrator.ts
@@ -6,6 +6,7 @@ const BATCH_SIZE = 500; // Process 500 (prev. used) 10 questions at a time
 
 export const vendorQuestionnaireOrchestratorTask = task({
   id: 'vendor-questionnaire-orchestrator',
+  machine: 'large-2x',
   retry: {
     maxAttempts: 3,
   },