diff --git a/apps/app/src/actions/risk/task/update-task-action.ts b/apps/app/src/actions/risk/task/update-task-action.ts
index 5521ad94ec..2cae22847a 100644
--- a/apps/app/src/actions/risk/task/update-task-action.ts
+++ b/apps/app/src/actions/risk/task/update-task-action.ts
@@ -9,55 +9,55 @@ import { authActionClient } from "../../safe-action";
 import { updateTaskSchema } from "../../schema";
 
 export const updateTaskAction = authActionClient
-	.schema(updateTaskSchema)
-	.metadata({
-		name: "update-task",
-		track: {
-			event: "update-task",
-			channel: "server",
-		},
-	})
-	.action(async ({ parsedInput, ctx }) => {
-		const { id, dueDate, status, assigneeId, title, description } = parsedInput;
-		const { session } = ctx;
-
-		if (!session.activeOrganizationId) {
-			throw new Error("Invalid user input");
-		}
-
-		try {
-			const task = await db.task.findUnique({
-				where: {
-					id: id,
-				},
-			});
-
-			if (!task) {
-				throw new Error("Task not found");
-			}
-
-			await db.task.update({
-				where: {
-					id: id,
-					organizationId: session.activeOrganizationId,
-				},
-				data: {
-					dueDate: dueDate,
-					status: status as TaskStatus,
-					assigneeId: assigneeId,
-					title: title,
-					description: description,
-				},
-			});
-
-			revalidatePath(`/${session.activeOrganizationId}/risk`);
-			revalidatePath(`/${session.activeOrganizationId}/risk/${id}`);
-			revalidatePath(`/${session.activeOrganizationId}/risk/${id}/tasks/${id}`);
-			revalidateTag("risks");
-
-			return { success: true };
-		} catch (error) {
-			console.error(error);
-			return { success: false };
-		}
-	});
+  .schema(updateTaskSchema)
+  .metadata({
+    name: "update-task",
+    track: {
+      event: "update-task",
+      channel: "server",
+    },
+  })
+  .action(async ({ parsedInput, ctx }) => {
+    const { id, dueDate, status, assigneeId, title, description } = parsedInput;
+    const { session } = ctx;
+
+    if (!session.activeOrganizationId) {
+      throw new Error("Invalid user input");
+    }
+
+    try {
+      const task = await db.task.findUnique({
+        where: {
+          id: id,
+        },
+      });
+
+      if (!task) {
+        throw new Error("Task not found");
+      }
+
+      await db.task.update({
+        where: {
+          id: id,
+          organizationId: session.activeOrganizationId,
+        },
+        data: {
+          dueDate: dueDate,
+          status: status as TaskStatus,
+          assigneeId,
+          title: title,
+          description: description,
+        },
+      });
+
+      revalidatePath(`/${session.activeOrganizationId}/risk`);
+      revalidatePath(`/${session.activeOrganizationId}/risk/${id}`);
+      revalidatePath(`/${session.activeOrganizationId}/risk/${id}/tasks/${id}`);
+      revalidateTag("risks");
+
+      return { success: true };
+    } catch (error) {
+      console.error(error);
+      return { success: false };
+    }
+  });
diff --git a/apps/app/src/actions/schema.ts b/apps/app/src/actions/schema.ts
index 5a32495d8c..44748a37da 100644
--- a/apps/app/src/actions/schema.ts
+++ b/apps/app/src/actions/schema.ts
@@ -1,292 +1,284 @@
 import {
-	Departments,
-	FrameworkId,
-	Frequency,
-	Impact,
-	Likelihood,
-	PolicyStatus,
-	RiskCategory,
-	RiskStatus,
-	TaskStatus,
+  Departments,
+  FrameworkId,
+  Frequency,
+  Impact,
+  Likelihood,
+  PolicyStatus,
+  RiskCategory,
+  RiskStatus,
+  TaskStatus,
 } from "@comp/db/types";
 import { z } from "zod";
 
 export const organizationSchema = z.object({
-	name: z.string().min(1, "Organization name is required"),
-	frameworks: z
-		.array(z.nativeEnum(FrameworkId))
-		.min(1, "Please select at least one framework to get started with"),
+  name: z.string().min(1, "Organization name is required"),
+  frameworks: z
+    .array(z.nativeEnum(FrameworkId))
+    .min(1, "Please select at least one framework to get started with"),
 });
 
 export type OrganizationSchema = z.infer<typeof organizationSchema>;
 
 export const organizationNameSchema = z.object({
-	name: z
-		.string()
-		.min(1, "Organization name is required")
-		.max(255, "Organization name cannot exceed 255 characters"),
+  name: z
+    .string()
+    .min(1, "Organization name is required")
+    .max(255, "Organization name cannot exceed 255 characters"),
 });
 
 export const subdomainAvailabilitySchema = z.object({
-	subdomain: z
-		.string()
-		.min(1, "Subdomain is required")
-		.max(255, "Subdomain cannot exceed 255 characters")
-		.regex(/^[a-z0-9-]+$/, {
-			message:
-				"Subdomain can only contain lowercase letters, numbers, and hyphens",
-		}),
+  subdomain: z
+    .string()
+    .min(1, "Subdomain is required")
+    .max(255, "Subdomain cannot exceed 255 characters")
+    .regex(/^[a-z0-9-]+$/, {
+      message:
+        "Subdomain can only contain lowercase letters, numbers, and hyphens",
+    }),
 });
 
 export const uploadSchema = z.object({
-	file: z.instanceof(File),
-	organizationId: z.string(),
+  file: z.instanceof(File),
+  organizationId: z.string(),
 });
 
 export const deleteOrganizationSchema = z.object({
-	id: z.string(),
-	organizationId: z.string(),
+  id: z.string(),
+  organizationId: z.string(),
 });
 
 export const sendFeedbackSchema = z.object({
-	feedback: z.string(),
+  feedback: z.string(),
 });
 
 export const updaterMenuSchema = z.array(
-	z.object({
-		path: z.string(),
-		name: z.string(),
-	}),
+  z.object({
+    path: z.string(),
+    name: z.string(),
+  })
 );
 
 export const organizationWebsiteSchema = z.object({
-	website: z.string().url().max(255),
+  website: z.string().url().max(255),
 });
 
 // Risks
 export const createRiskSchema = z.object({
-	title: z
-		.string({
-			required_error: "Risk name is required",
-		})
-		.min(1, {
-			message: "Risk name should be at least 1 character",
-		})
-		.max(100, {
-			message: "Risk name should be at most 100 characters",
-		}),
-	description: z
-		.string({
-			required_error: "Risk description is required",
-		})
-		.min(1, {
-			message: "Risk description should be at least 1 character",
-		})
-		.max(255, {
-			message: "Risk description should be at most 255 characters",
-		}),
-	category: z.nativeEnum(RiskCategory, {
-		required_error: "Risk category is required",
-	}),
-	department: z.nativeEnum(Departments, {
-		required_error: "Risk department is required",
-	}),
-	assigneeId: z.string().nullable(),
+  title: z
+    .string({
+      required_error: "Risk name is required",
+    })
+    .min(1, {
+      message: "Risk name should be at least 1 character",
+    })
+    .max(100, {
+      message: "Risk name should be at most 100 characters",
+    }),
+  description: z
+    .string({
+      required_error: "Risk description is required",
+    })
+    .min(1, {
+      message: "Risk description should be at least 1 character",
+    })
+    .max(255, {
+      message: "Risk description should be at most 255 characters",
+    }),
+  category: z.nativeEnum(RiskCategory, {
+    required_error: "Risk category is required",
+  }),
+  department: z.nativeEnum(Departments, {
+    required_error: "Risk department is required",
+  }),
+  assigneeId: z.string().optional().nullable(),
 });
 
 export const updateRiskSchema = z.object({
-	id: z.string().min(1, {
-		message: "Risk ID is required",
-	}),
-	title: z.string().min(1, {
-		message: "Risk title is required",
-	}),
-	description: z.string().min(1, {
-		message: "Risk description is required",
-	}),
-	category: z.nativeEnum(RiskCategory, {
-		required_error: "Risk category is required",
-	}),
-	department: z.nativeEnum(Departments, {
-		required_error: "Risk department is required",
-	}),
-	assigneeId: z.string().nullable(),
-	status: z.nativeEnum(RiskStatus, {
-		required_error: "Risk status is required",
-	}),
+  id: z.string().min(1, {
+    message: "Risk ID is required",
+  }),
+  title: z.string().min(1, {
+    message: "Risk title is required",
+  }),
+  description: z.string().min(1, {
+    message: "Risk description is required",
+  }),
+  category: z.nativeEnum(RiskCategory, {
+    required_error: "Risk category is required",
+  }),
+  department: z.nativeEnum(Departments, {
+    required_error: "Risk department is required",
+  }),
+  assigneeId: z.string().optional().nullable(),
+  status: z.nativeEnum(RiskStatus, {
+    required_error: "Risk status is required",
+  }),
 });
 
 export const createRiskCommentSchema = z.object({
-	riskId: z.string().min(1, {
-		message: "Risk ID is required",
-	}),
-	content: z
-		.string()
-		.min(1, {
-			message: "Comment content is required",
-		})
-		.max(1000, {
-			message: "Comment content should be at most 1000 characters",
-		}),
+  riskId: z.string().min(1, {
+    message: "Risk ID is required",
+  }),
+  content: z
+    .string()
+    .min(1, {
+      message: "Comment content is required",
+    })
+    .max(1000, {
+      message: "Comment content should be at most 1000 characters",
+    }),
 });
 
 export const createTaskSchema = z.object({
-	riskId: z.string().min(1, {
-		message: "Risk ID is required",
-	}),
-	title: z.string().min(1, {
-		message: "Task title is required",
-	}),
-	description: z.string().min(1, {
-		message: "Task description is required",
-	}),
-	dueDate: z.date().optional(),
-	assigneeId: z
-		.string({
-			required_error: "You must assign an owner to the task",
-		})
-		.min(1, {
-			message: "You must assign an owner to the task",
-		}),
+  riskId: z.string().min(1, {
+    message: "Risk ID is required",
+  }),
+  title: z.string().min(1, {
+    message: "Task title is required",
+  }),
+  description: z.string().min(1, {
+    message: "Task description is required",
+  }),
+  dueDate: z.date().optional(),
+  assigneeId: z.string().optional().nullable(),
 });
 
 export const updateTaskSchema = z.object({
-	id: z.string().min(1, {
-		message: "Task ID is required",
-	}),
-	title: z.string().optional(),
-	description: z.string().optional(),
-	dueDate: z.date().optional(),
-	status: z.nativeEnum(TaskStatus, {
-		required_error: "Task status is required",
-	}),
-	assigneeId: z.string({
-		required_error: "You must assign an owner to the task",
-	}),
+  id: z.string().min(1, {
+    message: "Task ID is required",
+  }),
+  title: z.string().optional(),
+  description: z.string().optional(),
+  dueDate: z.date().optional(),
+  status: z.nativeEnum(TaskStatus, {
+    required_error: "Task status is required",
+  }),
+  assigneeId: z.string().optional().nullable(),
 });
 
 export const createTaskCommentSchema = z.object({
-	riskId: z.string().min(1, {
-		message: "Risk ID is required",
-	}),
-	taskId: z.string().min(1, {
-		message: "Task ID is required",
-	}),
-	content: z
-		.string()
-		.min(1, {
-			message: "Comment content is required",
-		})
-		.max(1000, {
-			message: "Comment content should be at most 1000 characters",
-		}),
+  riskId: z.string().min(1, {
+    message: "Risk ID is required",
+  }),
+  taskId: z.string().min(1, {
+    message: "Task ID is required",
+  }),
+  content: z
+    .string()
+    .min(1, {
+      message: "Comment content is required",
+    })
+    .max(1000, {
+      message: "Comment content should be at most 1000 characters",
+    }),
 });
 
 export const uploadTaskFileSchema = z.object({
-	riskId: z.string().min(1, {
-		message: "Risk ID is required",
-	}),
-	taskId: z.string().min(1, {
-		message: "Task ID is required",
-	}),
+  riskId: z.string().min(1, {
+    message: "Risk ID is required",
+  }),
+  taskId: z.string().min(1, {
+    message: "Task ID is required",
+  }),
 });
 
 // Integrations
 export const deleteIntegrationConnectionSchema = z.object({
-	integrationId: z.string().min(1, {
-		message: "Integration ID is required",
-	}),
+  integrationId: z.string().min(1, {
+    message: "Integration ID is required",
+  }),
 });
 
 export const createIntegrationSchema = z.object({
-	integrationId: z.string().min(1, {
-		message: "Integration ID is required",
-	}),
+  integrationId: z.string().min(1, {
+    message: "Integration ID is required",
+  }),
 });
 
 // Seed Data
 export const seedDataSchema = z.object({
-	organizationId: z.string(),
+  organizationId: z.string(),
 });
 
 export const updateInherentRiskSchema = z.object({
-	id: z.string().min(1, {
-		message: "Risk ID is required",
-	}),
-	probability: z.nativeEnum(Likelihood),
-	impact: z.nativeEnum(Impact),
+  id: z.string().min(1, {
+    message: "Risk ID is required",
+  }),
+  probability: z.nativeEnum(Likelihood),
+  impact: z.nativeEnum(Impact),
 });
 
 export const updateResidualRiskSchema = z.object({
-	id: z.string().min(1, {
-		message: "Risk ID is required",
-	}),
-	probability: z.number().min(1).max(10),
-	impact: z.number().min(1).max(10),
+  id: z.string().min(1, {
+    message: "Risk ID is required",
+  }),
+  probability: z.number().min(1).max(10),
+  impact: z.number().min(1).max(10),
 });
 
 // Policies
 export const createPolicySchema = z.object({
-	title: z.string(),
-	description: z.string(),
-	frameworkIds: z.array(z.string()),
-	controlIds: z.array(z.string()),
+  title: z.string(),
+  description: z.string(),
+  frameworkIds: z.array(z.string()),
+  controlIds: z.array(z.string()),
 });
 
 export const updatePolicySchema = z.object({
-	id: z.string(),
-	content: z.any(),
+  id: z.string(),
+  content: z.any(),
 });
 
 export const assistantSettingsSchema = z.object({
-	enabled: z.boolean().optional(),
+  enabled: z.boolean().optional(),
 });
 
 export const createEmployeeSchema = z.object({
-	name: z.string().min(1, "Name is required"),
-	email: z.string().email("Invalid email address"),
-	department: z.nativeEnum(Departments, {
-		required_error: "Department is required",
-	}),
-	externalEmployeeId: z.string().optional(),
-	isActive: z.boolean().default(true),
+  name: z.string().min(1, "Name is required"),
+  email: z.string().email("Invalid email address"),
+  department: z.nativeEnum(Departments, {
+    required_error: "Department is required",
+  }),
+  externalEmployeeId: z.string().optional(),
+  isActive: z.boolean().default(true),
 });
 
 export const updatePolicyOverviewSchema = z.object({
-	id: z.string(),
-	title: z.string(),
-	description: z.string(),
-	isRequiredToSign: z.enum(["required", "not_required"]).optional(),
+  id: z.string(),
+  title: z.string(),
+  description: z.string(),
+  isRequiredToSign: z.enum(["required", "not_required"]).optional(),
 });
 
 export const updatePolicyFormSchema = z.object({
-	id: z.string(),
-	status: z.nativeEnum(PolicyStatus),
-	assigneeId: z.string().nullable(),
-	department: z.nativeEnum(Departments),
-	review_frequency: z.nativeEnum(Frequency),
-	review_date: z.date(),
-	isRequiredToSign: z.enum(["required", "not_required"]),
+  id: z.string(),
+  status: z.nativeEnum(PolicyStatus),
+  assigneeId: z.string().optional().nullable(),
+  department: z.nativeEnum(Departments),
+  review_frequency: z.nativeEnum(Frequency),
+  review_date: z.date(),
+  isRequiredToSign: z.enum(["required", "not_required"]),
 });
 
 export const apiKeySchema = z.object({
-	name: z
-		.string()
-		.min(1, { message: "Name is required" })
-		.max(64, { message: "Name must be less than 64 characters" }),
-	expiresAt: z.enum(["30days", "90days", "1year", "never"]),
+  name: z
+    .string()
+    .min(1, { message: "Name is required" })
+    .max(64, { message: "Name must be less than 64 characters" }),
+  expiresAt: z.enum(["30days", "90days", "1year", "never"]),
 });
 
 export const createPolicyCommentSchema = z.object({
-	policyId: z.string().min(1, {
-		message: "Policy ID is required",
-	}),
-	content: z
-		.string()
-		.min(1, {
-			message: "Comment content is required",
-		})
-		.max(1000, {
-			message: "Comment content should be at most 1000 characters",
-		}),
+  policyId: z.string().min(1, {
+    message: "Policy ID is required",
+  }),
+  content: z
+    .string()
+    .min(1, {
+      message: "Comment content is required",
+    })
+    .max(1000, {
+      message: "Comment content should be at most 1000 characters",
+    }),
 });
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/components/SelectAssignee.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/components/SelectAssignee.tsx
index 9529d3d6c9..5530f108c7 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/components/SelectAssignee.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/components/SelectAssignee.tsx
@@ -8,6 +8,7 @@ import {
 import { UserIcon } from "lucide-react";
 import { Member, User } from "@comp/db/types";
 import { useState, useEffect } from "react";
+import { db } from "@comp/db";
 
 interface SelectAssigneeProps {
   assigneeId: string | null;
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/employees/all/types/search-params.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/employees/all/types/search-params.ts
index 3f1579e77b..b51788dfc6 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/employees/all/types/search-params.ts
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/employees/all/types/search-params.ts
@@ -11,5 +11,5 @@ export const searchParamsCache = createSearchParamsCache({
   end: parseAsString,
   status: parseAsString,
   department: parseAsString,
-  ownerId: parseAsString,
+  assigneeId: parseAsString,
 });
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/page.tsx
index 6a9a3d337a..f3bb21065c 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/page.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/page.tsx
@@ -9,9 +9,6 @@ export default async function DashboardPage() {
 
 	const organizationId = session?.session.activeOrganizationId;
 
-	console.log("session", session);
-	console.log("organizationId", organizationId);
-
 	if (!organizationId) {
 		redirect("/");
 	}
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/(overview)/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/(overview)/layout.tsx
index 45a2d74ee3..34fff6454a 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/(overview)/layout.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/(overview)/layout.tsx
@@ -97,6 +97,9 @@ const getAssignees = cache(async () => {
 		where: {
 			organizationId: activeOrganizationId,
 			isActive: true,
+			role: {
+				notIn: ["employee"],
+			},
 		},
 		include: {
 			user: true,
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/page.tsx
index bd83caeb93..49a17b855e 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/page.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/page.tsx
@@ -13,221 +13,224 @@ import { headers } from "next/headers";
 import { redirect } from "next/navigation";
 
 interface PageProps {
-  searchParams: Promise<{
-    search?: string;
-    status?: string;
-    sort?: string;
-    page?: string;
-    per_page?: string;
-  }>;
-  params: Promise<{ riskId: string; locale: string }>;
+	searchParams: Promise<{
+		search?: string;
+		status?: string;
+		sort?: string;
+		page?: string;
+		per_page?: string;
+	}>;
+	params: Promise<{ riskId: string; locale: string }>;
 }
 
 export default async function RiskPage({ searchParams, params }: PageProps) {
-  const { riskId } = await params;
-  const risk = await getRisk(riskId);
-
-  const assignees = await getAssignees();
-  const t = await getI18n();
-
-  const {
-    search,
-    status,
-    sort,
-    page = "1",
-    per_page = "5",
-  } = await searchParams;
-
-  const columnHeaders = await getServerColumnHeaders();
-  const [column, order] = sort?.split(":") ?? [];
-  const hasFilters = !!(search || status);
-  const { tasks: loadedTasks, total } = await getTasks({
-    riskId,
-    search,
-    status: status as TaskStatus,
-    column,
-    order,
-    page: Number.parseInt(page),
-    per_page: Number.parseInt(per_page),
-  });
-
-  if (!risk) {
-    redirect("/");
-  }
-
-  return (
-    <div className="flex flex-col gap-4">
-      <RiskOverview risk={risk} assignees={assignees} />
-
-      <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-        <InherentRiskChart risk={risk} />
-        <ResidualRiskChart risk={risk} />
-      </div>
-    </div>
-  );
+	const { riskId } = await params;
+	const risk = await getRisk(riskId);
+
+	const assignees = await getAssignees();
+	const t = await getI18n();
+
+	const {
+		search,
+		status,
+		sort,
+		page = "1",
+		per_page = "5",
+	} = await searchParams;
+
+	const columnHeaders = await getServerColumnHeaders();
+	const [column, order] = sort?.split(":") ?? [];
+	const hasFilters = !!(search || status);
+	const { tasks: loadedTasks, total } = await getTasks({
+		riskId,
+		search,
+		status: status as TaskStatus,
+		column,
+		order,
+		page: Number.parseInt(page),
+		per_page: Number.parseInt(per_page),
+	});
+
+	if (!risk) {
+		redirect("/");
+	}
+
+	return (
+		<div className="flex flex-col gap-4">
+			<RiskOverview risk={risk} assignees={assignees} />
+
+			<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+				<InherentRiskChart risk={risk} />
+				<ResidualRiskChart risk={risk} />
+			</div>
+		</div>
+	);
 }
 
 async function getRisk(riskId: string) {
-  const session = await auth.api.getSession({
-    headers: await headers(),
-  });
-
-  if (!session || !session.session.activeOrganizationId) {
-    return null;
-  }
-
-  const risk = await db.risk.findUnique({
-    where: {
-      id: riskId,
-      organizationId: session.session.activeOrganizationId,
-    },
-    include: {
-      assignee: {
-        include: {
-          user: true,
-        },
-      },
-    },
-  });
-
-  return risk;
+	const session = await auth.api.getSession({
+		headers: await headers(),
+	});
+
+	if (!session || !session.session.activeOrganizationId) {
+		return null;
+	}
+
+	const risk = await db.risk.findUnique({
+		where: {
+			id: riskId,
+			organizationId: session.session.activeOrganizationId,
+		},
+		include: {
+			assignee: {
+				include: {
+					user: true,
+				},
+			},
+		},
+	});
+
+	return risk;
 }
 
 async function getTasks({
-  riskId,
-  search,
-  status,
-  column,
-  order,
-  page = 1,
-  per_page = 10,
+	riskId,
+	search,
+	status,
+	column,
+	order,
+	page = 1,
+	per_page = 10,
 }: {
-  riskId: string;
-  search?: string;
-  status?: TaskStatus;
-  column?: string;
-  order?: string;
-  page?: number;
-  per_page?: number;
+	riskId: string;
+	search?: string;
+	status?: TaskStatus;
+	column?: string;
+	order?: string;
+	page?: number;
+	per_page?: number;
 }) {
-  const session = await auth.api.getSession({
-    headers: await headers(),
-  });
-
-  if (!session || !session.session.activeOrganizationId) {
-    return { tasks: [], total: 0 };
-  }
-
-  const skip = (page - 1) * per_page;
-
-  const [tasks, total] = await Promise.all([
-    db.task
-      .findMany({
-        where: {
-          relatedId: riskId,
-          relatedType: "risk",
-          organizationId: session.session.activeOrganizationId,
-          AND: [
-            search
-              ? {
-                OR: [
-                  { title: { contains: search, mode: "insensitive" } },
-                  {
-                    description: { contains: search, mode: "insensitive" },
-                  },
-                ],
-              }
-              : {},
-            status ? { status } : {},
-          ],
-        },
-        orderBy: column
-          ? {
-            [column]: order === "asc" ? "asc" : "desc",
-          }
-          : {
-            createdAt: "desc",
-          },
-        skip,
-        take: per_page,
-        include: {
-          assignee: {
-            include: {
-              user: true,
-            },
-          },
-        },
-      })
-      .then((tasks) =>
-        tasks.map(
-          (task): RiskTaskType => ({
-            id: task.id,
-            riskId: task.relatedId,
-            title: task.title,
-            status: task.status,
-            dueDate: task.dueDate.toISOString(),
-            assigneeId: task.assigneeId,
-            assignee: {
-              name: task.assignee.user.name,
-              image: task.assignee.user.image ?? "",
-            },
-          }),
-        ),
-      ),
-    db.task.count({
-      where: {
-        relatedId: riskId,
-        relatedType: "risk",
-        organizationId: session.session.activeOrganizationId,
-        AND: [
-          search
-            ? {
-              OR: [
-                { title: { contains: search, mode: "insensitive" } },
-                { description: { contains: search, mode: "insensitive" } },
-              ],
-            }
-            : {},
-          status ? { status } : {},
-        ],
-      },
-    }),
-  ]);
-
-  return { tasks, total };
+	const session = await auth.api.getSession({
+		headers: await headers(),
+	});
+
+	if (!session || !session.session.activeOrganizationId) {
+		return { tasks: [], total: 0 };
+	}
+
+	const skip = (page - 1) * per_page;
+
+	const [tasks, total] = await Promise.all([
+		db.task
+			.findMany({
+				where: {
+					relatedId: riskId,
+					relatedType: "risk",
+					organizationId: session.session.activeOrganizationId,
+					AND: [
+						search
+							? {
+									OR: [
+										{ title: { contains: search, mode: "insensitive" } },
+										{
+											description: { contains: search, mode: "insensitive" },
+										},
+									],
+								}
+							: {},
+						status ? { status } : {},
+					],
+				},
+				orderBy: column
+					? {
+							[column]: order === "asc" ? "asc" : "desc",
+						}
+					: {
+							createdAt: "desc",
+						},
+				skip,
+				take: per_page,
+				include: {
+					assignee: {
+						include: {
+							user: true,
+						},
+					},
+				},
+			})
+			.then((tasks) =>
+				tasks.map(
+					(task): RiskTaskType => ({
+						id: task.id,
+						riskId: task.relatedId,
+						title: task.title,
+						status: task.status,
+						dueDate: task.dueDate.toISOString(),
+						assigneeId: task.assigneeId ?? "",
+						assignee: {
+							name: task.assignee?.user.name ?? "",
+							image: task.assignee?.user.image ?? "",
+						},
+					}),
+				),
+			),
+		db.task.count({
+			where: {
+				relatedId: riskId,
+				relatedType: "risk",
+				organizationId: session.session.activeOrganizationId,
+				AND: [
+					search
+						? {
+								OR: [
+									{ title: { contains: search, mode: "insensitive" } },
+									{ description: { contains: search, mode: "insensitive" } },
+								],
+							}
+						: {},
+					status ? { status } : {},
+				],
+			},
+		}),
+	]);
+
+	return { tasks, total };
 }
 
 async function getAssignees() {
-  const session = await auth.api.getSession({
-    headers: await headers(),
-  });
-
-  if (!session || !session.session.activeOrganizationId) {
-    return [];
-  }
-
-  const assignees = await db.member.findMany({
-    where: {
-      organizationId: session.session.activeOrganizationId,
-    },
-    include: {
-      user: true,
-    },
-  });
-
-  return assignees;
+	const session = await auth.api.getSession({
+		headers: await headers(),
+	});
+
+	if (!session || !session.session.activeOrganizationId) {
+		return [];
+	}
+
+	const assignees = await db.member.findMany({
+		where: {
+			organizationId: session.session.activeOrganizationId,
+			role: {
+				notIn: ["employee"],
+			},
+		},
+		include: {
+			user: true,
+		},
+	});
+
+	return assignees;
 }
 
 export async function generateMetadata({
-  params,
+	params,
 }: {
-  params: Promise<{ locale: string }>;
+	params: Promise<{ locale: string }>;
 }): Promise<Metadata> {
-  const { locale } = await params;
-  setStaticParamsLocale(locale);
-  const t = await getI18n();
+	const { locale } = await params;
+	setStaticParamsLocale(locale);
+	const t = await getI18n();
 
-  return {
-    title: t("risk.risk_overview"),
-  };
+	return {
+		title: t("risk.risk_overview"),
+	};
 }
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/tasks/search-params.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/tasks/search-params.ts
index 55c0834e4e..1f1d026e22 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/tasks/search-params.ts
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/tasks/search-params.ts
@@ -10,5 +10,5 @@ export const searchParamsCache = createSearchParamsCache({
   start: parseAsString,
   end: parseAsString,
   status: parseAsString,
-  ownerId: parseAsString,
+  assigneeId: parseAsString,
 });
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/(overview)/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/(overview)/layout.tsx
index f8cf8215f8..23dc53daef 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/(overview)/layout.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/(overview)/layout.tsx
@@ -21,8 +21,8 @@ export default async function Layout({
 	});
 
 	const orgId = activeOrganizationId;
-
 	const overview = await getVendorOverview();
+	const assignees = await getAssignees();
 
 	if (overview?.vendors === 0) {
 		return (
@@ -51,7 +51,7 @@ export default async function Layout({
 								},
 							]}
 						/>
-						<CreateVendorSheet />
+						<CreateVendorSheet assignees={assignees} />
 					</div>
 				</Suspense>
 			</div>
@@ -77,6 +77,32 @@ export default async function Layout({
 	);
 }
 
+const getAssignees = cache(async () => {
+	const {
+		session: { activeOrganizationId },
+	} = await getServersideSession({
+		headers: await headers(),
+	});
+
+	if (!activeOrganizationId) {
+		return [];
+	}
+
+	const assignees = await db.member.findMany({
+		where: {
+			organizationId: activeOrganizationId,
+			role: {
+				notIn: ["employee"],
+			},
+		},
+		include: {
+			user: true,
+		},
+	});
+
+	return assignees;
+});
+
 const getVendorOverview = cache(async () => {
 	const {
 		session: { activeOrganizationId },
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/task/create-task-action.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/task/create-task-action.ts
index 71fa7dc8b0..9bc58a6411 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/task/create-task-action.ts
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/task/create-task-action.ts
@@ -8,51 +8,47 @@ import { authActionClient } from "@/actions/safe-action";
 import { createVendorTaskSchema } from "../schema";
 
 export const createVendorTaskAction = authActionClient
-	.schema(createVendorTaskSchema)
-	.metadata({
-		name: "create-vendor-task",
-		track: {
-			event: "create-vendor-task",
-			channel: "server",
-		},
-	})
-	.action(async ({ parsedInput, ctx }) => {
-		const { vendorId, title, description, dueDate, assigneeId } = parsedInput;
-		const {
-			session: { activeOrganizationId },
-			user,
-		} = ctx;
-
-		if (!user.id || !activeOrganizationId) {
-			throw new Error("Invalid user input");
-		}
-
-		if (!assigneeId) {
-			throw new Error("Assignee ID is required");
-		}
-
-		try {
-			await db.task.create({
-				data: {
-					title,
-					description,
-					dueDate,
-					assigneeId,
-					organizationId: activeOrganizationId,
-					relatedId: vendorId,
-					relatedType: "vendor",
-				},
-			});
-
-			revalidatePath(`/${activeOrganizationId}/vendor/${vendorId}`);
-			revalidateTag(`vendor_${activeOrganizationId}`);
-
-			return {
-				success: true,
-			};
-		} catch (error) {
-			return {
-				success: false,
-			};
-		}
-	});
+  .schema(createVendorTaskSchema)
+  .metadata({
+    name: "create-vendor-task",
+    track: {
+      event: "create-vendor-task",
+      channel: "server",
+    },
+  })
+  .action(async ({ parsedInput, ctx }) => {
+    const { vendorId, title, description, dueDate, assigneeId } = parsedInput;
+    const {
+      session: { activeOrganizationId },
+      user,
+    } = ctx;
+
+    if (!user.id || !activeOrganizationId) {
+      throw new Error("Invalid user input");
+    }
+
+    try {
+      await db.task.create({
+        data: {
+          title,
+          description,
+          dueDate,
+          assigneeId,
+          organizationId: activeOrganizationId,
+          relatedId: vendorId,
+          relatedType: "vendor",
+        },
+      });
+
+      revalidatePath(`/${activeOrganizationId}/vendor/${vendorId}`);
+      revalidateTag(`vendor_${activeOrganizationId}`);
+
+      return {
+        success: true,
+      };
+    } catch (error) {
+      return {
+        success: false,
+      };
+    }
+  });
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/update-vendor-action.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/update-vendor-action.ts
index 22a9f279f6..2f5b718415 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/update-vendor-action.ts
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/update-vendor-action.ts
@@ -8,49 +8,50 @@ import { authActionClient } from "@/actions/safe-action";
 import { updateVendorSchema } from "./schema";
 
 export const updateVendorAction = authActionClient
-	.schema(updateVendorSchema)
-	.metadata({
-		name: "update-vendor",
-		track: {
-			event: "update-vendor",
-			channel: "server",
-		},
-	})
-	.action(async ({ parsedInput, ctx }) => {
-		const { id, name, description, category, status } = parsedInput;
-		const { session } = ctx;
-
-		if (!session.activeOrganizationId) {
-			throw new Error("Invalid user input");
-		}
-
-		try {
-			await db.vendor.update({
-				where: {
-					id,
-					organizationId: session.activeOrganizationId,
-				},
-				data: {
-					name,
-					description,
-					category,
-					status,
-				},
-			});
-
-			revalidatePath(`/${session.activeOrganizationId}/vendors`);
-			revalidatePath(`/${session.activeOrganizationId}/vendors/register`);
-			revalidatePath(`/${session.activeOrganizationId}/vendors/${id}`);
-			revalidateTag("vendors");
-
-			return {
-				success: true,
-			};
-		} catch (error) {
-			console.error("Error updating vendor:", error);
-
-			return {
-				success: false,
-			};
-		}
-	});
+  .schema(updateVendorSchema)
+  .metadata({
+    name: "update-vendor",
+    track: {
+      event: "update-vendor",
+      channel: "server",
+    },
+  })
+  .action(async ({ parsedInput, ctx }) => {
+    const { id, name, description, category, assigneeId, status } = parsedInput;
+    const { session } = ctx;
+
+    if (!session.activeOrganizationId) {
+      throw new Error("Invalid user input");
+    }
+
+    try {
+      await db.vendor.update({
+        where: {
+          id,
+          organizationId: session.activeOrganizationId,
+        },
+        data: {
+          name,
+          description,
+          assigneeId,
+          category,
+          status,
+        },
+      });
+
+      revalidatePath(`/${session.activeOrganizationId}/vendors`);
+      revalidatePath(`/${session.activeOrganizationId}/vendors/register`);
+      revalidatePath(`/${session.activeOrganizationId}/vendors/${id}`);
+      revalidateTag("vendors");
+
+      return {
+        success: true,
+      };
+    } catch (error) {
+      console.error("Error updating vendor:", error);
+
+      return {
+        success: false,
+      };
+    }
+  });
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/update-vendor-residual-risk.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/update-vendor-residual-risk.ts
index 08f0e4a05d..160e5fcc8b 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/update-vendor-residual-risk.ts
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/update-vendor-residual-risk.ts
@@ -4,33 +4,36 @@ import { appErrors } from "@/lib/errors";
 import type { ActionResponse } from "@/types/actions";
 import { db } from "@comp/db";
 import { createSafeActionClient } from "next-safe-action";
+import { revalidatePath } from "next/cache";
 import { z } from "zod";
 import { Impact, Likelihood } from "@prisma/client";
 
 const schema = z.object({
-	vendorId: z.string(),
-	residualProbability: z.nativeEnum(Likelihood),
-	residualImpact: z.nativeEnum(Impact),
+  vendorId: z.string(),
+  residualProbability: z.nativeEnum(Likelihood),
+  residualImpact: z.nativeEnum(Impact),
 });
 
 export const updateVendorResidualRisk = createSafeActionClient()
-	.schema(schema)
-	.action(async ({ parsedInput }): Promise<ActionResponse> => {
-		try {
-			await db.vendor.update({
-				where: { id: parsedInput.vendorId },
-				data: {
-					residualProbability: parsedInput.residualProbability,
-					residualImpact: parsedInput.residualImpact,
-				},
-			});
+  .schema(schema)
+  .action(async ({ parsedInput }): Promise<ActionResponse> => {
+    try {
+      await db.vendor.update({
+        where: { id: parsedInput.vendorId },
+        data: {
+          residualProbability: parsedInput.residualProbability,
+          residualImpact: parsedInput.residualImpact,
+        },
+      });
 
-			return { success: true };
-		} catch (error) {
-			return {
-				success: false,
-				error:
-					error instanceof Error ? error.message : appErrors.UNEXPECTED_ERROR,
-			};
-		}
-	});
+      revalidatePath(`/vendors/${parsedInput.vendorId}`);
+
+      return { success: true };
+    } catch (error) {
+      return {
+        success: false,
+        error:
+          error instanceof Error ? error.message : appErrors.UNEXPECTED_ERROR,
+      };
+    }
+  });
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/inherent-risk-vendor-chart.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/inherent-risk-vendor-chart.tsx
index e1e44b6878..5f6204cb5c 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/inherent-risk-vendor-chart.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/inherent-risk-vendor-chart.tsx
@@ -11,140 +11,238 @@ import {
 	CardHeader,
 	CardTitle,
 } from "@comp/ui/card";
-import {
-	ChartContainer,
-	ChartTooltip,
-	ChartTooltipContent,
-} from "@comp/ui/chart";
 import { PencilIcon } from "lucide-react";
 import { useQueryState } from "nuqs";
-import {
-	PolarAngleAxis,
-	PolarGrid,
-	PolarRadiusAxis,
-	Radar,
-	RadarChart,
-} from "recharts";
 import { InherentRiskSheet } from "./inherent-risk";
-import { useCallback } from "react";
 
 interface InherentRiskChartProps {
 	vendor: Vendor;
 }
 
+// Map enum values to numeric scores (1-5)
+const LIKELIHOOD_SCORES: Record<Likelihood, number> = {
+	very_unlikely: 1,
+	unlikely: 2,
+	possible: 3,
+	likely: 4,
+	very_likely: 5,
+};
+
+const IMPACT_SCORES: Record<Impact, number> = {
+	insignificant: 1,
+	minor: 2,
+	moderate: 3,
+	major: 4,
+	severe: 5,
+};
+
+// Risk level colors
+const RISK_COLORS = {
+	low: "#22c55e", // green
+	medium: "#f59e0b", // amber
+	high: "#f97316", // orange
+	critical: "#ef4444", // red
+};
+
 export function InherentRiskVendorChart({ vendor }: InherentRiskChartProps) {
 	const t = useI18n();
 	const [open, setOpen] = useQueryState("inherent-risk-sheet");
 
-	// Create a stable callback function for onSuccess
-	const handleSuccess = useCallback(() => {
-		console.log("Closing inherent risk sheet");
-		setOpen(null);
-	}, [setOpen]);
-
-	// Convert the enum values to numeric scores for display
-	const getRiskScore = (probability: Likelihood, impact: Impact) => {
-		const probabilityScores: Record<Likelihood, number> = {
-			very_unlikely: 10,
-			unlikely: 30,
-			possible: 50,
-			likely: 70,
-			very_likely: 90,
-		};
-
-		const impactScores: Record<Impact, number> = {
-			insignificant: 10,
-			minor: 30,
-			moderate: 50,
-			major: 70,
-			severe: 90,
-		};
-
-		return (probabilityScores[probability] * impactScores[impact]) / 100;
-	};
-
-	const inherentRiskScore = getRiskScore(
-		vendor.inherentProbability,
-		vendor.inherentImpact,
-	);
+	// Debug information
+	console.log("VENDOR DATA:", {
+		inherentProbability: vendor.inherentProbability,
+		inherentImpact: vendor.inherentImpact,
+		probabilityScore: LIKELIHOOD_SCORES[vendor.inherentProbability],
+		impactScore: IMPACT_SCORES[vendor.inherentImpact],
+	});
+
+	// Calculate risk score from probability and impact
+	const riskScore =
+		LIKELIHOOD_SCORES[vendor.inherentProbability] *
+		IMPACT_SCORES[vendor.inherentImpact];
+
+	// Determine risk level
+	let riskLevel = "low";
+	if (riskScore > 16) riskLevel = "critical";
+	else if (riskScore > 9) riskLevel = "high";
+	else if (riskScore > 4) riskLevel = "medium";
+
+	// Get color based on risk level
+	const riskColor = RISK_COLORS[riskLevel as keyof typeof RISK_COLORS];
+
+	// Define the visual order of likelihood for rendering
+	const VISUAL_LIKELIHOOD_ORDER: Likelihood[] = [
+		Likelihood.very_likely,
+		Likelihood.likely,
+		Likelihood.possible,
+		Likelihood.unlikely,
+		Likelihood.very_unlikely,
+	];
 
-	const data = [
-		{
-			metric: t("vendors.risks.inherent_risk"),
-			value: inherentRiskScore,
-			fullMark: 100,
-		},
+	// We'll determine the active cell while building the grid
+	const yAxisLabels = [
+		"V.Likely", // Corresponds to VISUAL_LIKELIHOOD_ORDER[0]
+		"Likely",
+		"Possible",
+		"Unlikely",
+		"V.Unlikely", // Corresponds to VISUAL_LIKELIHOOD_ORDER[4]
 	];
+	const xAxisLabels = ["Insig", "Minor", "Mod", "Major", "Severe"];
 
-	const chartConfig = {
-		risk: {
-			label: t("vendors.risks.inherent_risk"),
-			theme: {
-				light: "#ef4444",
-				dark: "#dc2626",
-			},
-		},
-	};
+	// Store the active cell position values
+	const activeProbability = vendor.inherentProbability;
+	const activeImpact = vendor.inherentImpact;
 
 	return (
-		<Card>
-			<CardHeader>
-				<div className="flex justify-between items-center">
-					<div>
-						<CardTitle>
-							<div className="flex items-center justify-between gap-2">
-								{t("vendors.risks.inherent_risk")}
-								<Button
-									onClick={() => {
-										console.log("Inherent risk edit button clicked");
-										setOpen("true");
-									}}
-									size="icon"
-									variant="ghost"
-									className="p-0 m-0 size-auto"
-								>
-									<PencilIcon className="h-3 w-3" />
-								</Button>
+		<>
+			<Card>
+				<CardHeader>
+					<div className="flex justify-between items-center">
+						<div className="w-full">
+							<CardTitle>
+								<div className="flex items-center justify-between gap-2">
+									{t("vendors.risks.inherent_risk")}
+									<Button
+										onClick={() => setOpen("true")}
+										size="icon"
+										variant="ghost"
+										className="p-0 m-0 size-auto"
+									>
+										<PencilIcon className="h-4 w-4" />
+									</Button>
+								</div>
+							</CardTitle>
+							<CardDescription className="text-xs">
+								{t("vendors.risks.update_inherent_risk_description")}
+							</CardDescription>
+						</div>
+					</div>
+				</CardHeader>
+				<CardContent>
+					<div className="mb-8">
+						{/* 5x5 Risk Matrix */}
+						<div className="relative w-full aspect-[1.5/1] max-h-[300px]">
+							{/* Y-axis label */}
+							<div className="absolute left-[-30px] top-1/2 -translate-y-1/2 -rotate-90 font-semibold text-sm text-muted-foreground z-10">
+								Probability
+							</div>
+
+							{/* Main grid container */}
+							<div className="absolute top-0 left-[90px] right-[10px] bottom-[35px]">
+								<div className="relative w-full h-full border-l border-b">
+									{/* Grid rows */}
+									{[...Array(5)].map((_, rowIndex) => {
+										// Map row index to likelihood enum based on visual order
+										const rowLikelihood = VISUAL_LIKELIHOOD_ORDER[rowIndex];
+
+										return (
+											<div
+												key={`row-${rowIndex}`}
+												className="h-[20%] flex border-t"
+											>
+												{/* Grid cells for this row */}
+												{[...Array(5)].map((_, colIndex) => {
+													// Map column index to impact enum
+													const colImpact = Object.keys(IMPACT_SCORES)[
+														colIndex
+													] as Impact;
+
+													// Calculate cell score and color
+													const likelihoodScore =
+														LIKELIHOOD_SCORES[rowLikelihood];
+													const impactScore = IMPACT_SCORES[colImpact];
+													const cellScore = likelihoodScore * impactScore;
+
+													let cellColor = RISK_COLORS.low;
+													if (cellScore > 16) cellColor = RISK_COLORS.critical;
+													else if (cellScore > 9) cellColor = RISK_COLORS.high;
+													else if (cellScore > 4)
+														cellColor = RISK_COLORS.medium;
+
+													// Check if this is the active cell
+													const isActive =
+														rowLikelihood === activeProbability &&
+														colImpact === activeImpact;
+
+													return (
+														<div
+															key={`cell-${rowIndex}-${colIndex}`}
+															className="w-[20%] border-r relative"
+															style={{ backgroundColor: `${cellColor}25` }}
+														>
+															{isActive && (
+																<div className="absolute inset-0 flex items-center justify-center">
+																	<div
+																		className="absolute inset-0 z-10 border-2"
+																		style={{
+																			backgroundColor: cellColor,
+																			borderColor: cellColor,
+																			opacity: 0.9,
+																		}}
+																	/>
+																</div>
+															)}
+														</div>
+													);
+												})}
+											</div>
+										);
+									})}
+
+									{/* Y-axis labels - positioned outside the grid */}
+									{yAxisLabels.map((label, i) => (
+										<div
+											key={`y-label-${i}`}
+											className="absolute text-sm text-right"
+											style={{
+												left: "-75px",
+												top: `${i * 20 + 10}%`,
+												transform: "translateY(-50%)",
+												width: "65px",
+											}}
+										>
+											{label}
+										</div>
+									))}
+
+									{/* X-axis labels */}
+									{xAxisLabels.map((label, i) => (
+										<div
+											key={`x-label-${i}`}
+											className="absolute text-sm text-center"
+											style={{
+												left: `${i * 20 + 10}%`,
+												bottom: "-25px",
+												transform: "translateX(-50%)",
+												width: "40px",
+											}}
+										>
+											{label}
+										</div>
+									))}
+
+									{/* X-axis title */}
+									<div
+										className="absolute font-semibold text-sm text-muted-foreground"
+										style={{
+											bottom: "-45px",
+											left: "50%",
+											transform: "translateX(-50%)",
+										}}
+									>
+										Impact
+									</div>
+								</div>
 							</div>
-						</CardTitle>
-						<CardDescription className="text-xs">
-							{t("vendors.risks.update_inherent_risk_description")}
-						</CardDescription>
+						</div>
 					</div>
-				</div>
-			</CardHeader>
-			<CardContent>
-				<ChartContainer config={chartConfig}>
-					<RadarChart data={data}>
-						<PolarGrid gridType="polygon" />
-						<PolarAngleAxis
-							dataKey="metric"
-							tick={{ fill: "currentColor", fontSize: 12 }}
-						/>
-						<PolarRadiusAxis
-							domain={[0, 100]}
-							tick={{ fill: "currentColor", fontSize: 12 }}
-						/>
-						<Radar
-							name="risk"
-							dataKey="value"
-							stroke="var(--color-risk)"
-							fill="var(--color-risk)"
-							fillOpacity={0.5}
-						/>
-						<ChartTooltip
-							cursor={false}
-							content={<ChartTooltipContent indicator="line" />}
-						/>
-					</RadarChart>
-				</ChartContainer>
-				<InherentRiskSheet
-					vendorId={vendor.id}
-					initialProbability={vendor.inherentProbability}
-					initialImpact={vendor.inherentImpact}
-					onSuccess={handleSuccess}
-				/>
-			</CardContent>
-		</Card>
+				</CardContent>
+			</Card>
+			<InherentRiskSheet
+				vendorId={vendor.id}
+				initialProbability={vendor.inherentProbability}
+				initialImpact={vendor.inherentImpact}
+			/>
+		</>
 	);
 }
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/inherent-risk.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/inherent-risk.tsx
index ffe6fac184..b7a7e91287 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/inherent-risk.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/inherent-risk.tsx
@@ -15,7 +15,7 @@ import {
 import { X } from "lucide-react";
 import { InherentRiskForm } from "@/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/forms/risks/inherent-risk-form";
 import { Impact, Likelihood } from "@prisma/client";
-import { useState } from "react";
+import { useQueryState } from "nuqs";
 
 export function InherentRiskSheet({
 	vendorId,
@@ -30,18 +30,22 @@ export function InherentRiskSheet({
 }) {
 	const t = useI18n();
 	const isDesktop = useMediaQuery("(min-width: 768px)");
-	const [isOpen, setIsOpen] = useState(true);
+	const [open, setOpen] = useQueryState("inherent-risk-sheet");
+	const isOpen = open === "true";
 
-	const handleClose = () => setIsOpen(false);
+	const handleClose = () => setOpen(null);
 
 	const handleFormSuccess = () => {
-		setIsOpen(false);
+		setOpen(null);
 		if (onSuccess) onSuccess();
 	};
 
 	if (isDesktop) {
 		return (
-			<Sheet open={isOpen} onOpenChange={setIsOpen}>
+			<Sheet
+				open={isOpen}
+				onOpenChange={(value) => setOpen(value ? "true" : null)}
+			>
 				<SheetContent stack>
 					<SheetHeader className="mb-8">
 						<div className="flex justify-between items-center flex-row">
@@ -74,7 +78,10 @@ export function InherentRiskSheet({
 	}
 
 	return (
-		<Drawer open={isOpen} onOpenChange={setIsOpen}>
+		<Drawer
+			open={isOpen}
+			onOpenChange={(value) => setOpen(value ? "true" : null)}
+		>
 			<DrawerTitle hidden>
 				{t("vendors.risks.update_inherent_risk")}
 			</DrawerTitle>
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/residual-risk-vendor-chart.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/residual-risk-vendor-chart.tsx
index 1961fa16f1..62d22920fc 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/residual-risk-vendor-chart.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/residual-risk-vendor-chart.tsx
@@ -2,6 +2,7 @@
 
 import { useI18n } from "@/locales/client";
 import type { Vendor } from "@comp/db/types";
+import { Impact, Likelihood } from "@prisma/client";
 import { Button } from "@comp/ui/button";
 import {
 	Card,
@@ -10,138 +11,226 @@ import {
 	CardHeader,
 	CardTitle,
 } from "@comp/ui/card";
-import {
-	ChartContainer,
-	ChartTooltip,
-	ChartTooltipContent,
-} from "@comp/ui/chart";
 import { PencilIcon } from "lucide-react";
 import { useQueryState } from "nuqs";
-import {
-	PolarAngleAxis,
-	PolarGrid,
-	PolarRadiusAxis,
-	Radar,
-	RadarChart,
-} from "recharts";
 import { ResidualRiskSheet } from "./residual-risk";
-import { useCallback } from "react";
 
 interface ResidualRiskChartProps {
 	vendor: Vendor;
 }
 
+// Map enum values to numeric scores (1-5)
+const LIKELIHOOD_SCORES: Record<Likelihood, number> = {
+	very_unlikely: 1,
+	unlikely: 2,
+	possible: 3,
+	likely: 4,
+	very_likely: 5,
+};
+
+const IMPACT_SCORES: Record<Impact, number> = {
+	insignificant: 1,
+	minor: 2,
+	moderate: 3,
+	major: 4,
+	severe: 5,
+};
+
+// Risk level colors
+const RISK_COLORS = {
+	low: "#22c55e", // green
+	medium: "#f59e0b", // amber
+	high: "#f97316", // orange
+	critical: "#ef4444", // red
+};
+
 export function ResidualRiskVendorChart({ vendor }: ResidualRiskChartProps) {
 	const t = useI18n();
 	const [open, setOpen] = useQueryState("residual-risk-sheet");
 
-	// Log when the sheet open state changes for debugging
-	console.log("Residual risk sheet query state:", { open });
-
-	// Log the vendor data to check the structure and values
-	console.log("Vendor residual risk data:", {
-		id: vendor.id,
-		residualRisk: vendor.residualProbability,
-	});
-
-	// Create a stable callback function for onSuccess
-	const handleSuccess = useCallback(() => {
-		console.log("Closing residual risk sheet");
-		setOpen(null);
-	}, [setOpen]);
-
-	// Convert the enum values to numeric scores for display
-	const getRiskScore = (risk: string) => {
-		switch (risk) {
-			case "low":
-				return 30;
-			case "medium":
-				return 60;
-			case "high":
-				return 90;
-			default:
-				return 0;
-		}
-	};
-
-	const residualRiskScore = getRiskScore(vendor.residualProbability);
-
-	const data = [
-		{
-			metric: t("vendors.risks.residual_risk"),
-			value: residualRiskScore,
-			fullMark: 100,
-		},
+	// Calculate risk score from probability and impact
+	const riskScore =
+		LIKELIHOOD_SCORES[vendor.residualProbability] *
+		IMPACT_SCORES[vendor.residualImpact];
+
+	// Determine risk level
+	let riskLevel = "low";
+	if (riskScore > 16) riskLevel = "critical";
+	else if (riskScore > 9) riskLevel = "high";
+	else if (riskScore > 4) riskLevel = "medium";
+
+	// Get color based on risk level
+	const riskColor = RISK_COLORS[riskLevel as keyof typeof RISK_COLORS];
+
+	// Define the visual order of likelihood for rendering
+	const VISUAL_LIKELIHOOD_ORDER: Likelihood[] = [
+		Likelihood.very_likely,
+		Likelihood.likely,
+		Likelihood.possible,
+		Likelihood.unlikely,
+		Likelihood.very_unlikely,
 	];
 
-	const chartConfig = {
-		risk: {
-			label: t("vendors.risks.residual_risk"),
-			theme: {
-				light: "#ef4444",
-				dark: "#dc2626",
-			},
-		},
-	};
+	// We'll determine the active cell while building the grid
+	const yAxisLabels = [
+		"V.Likely", // Corresponds to VISUAL_LIKELIHOOD_ORDER[0]
+		"Likely",
+		"Possible",
+		"Unlikely",
+		"V.Unlikely", // Corresponds to VISUAL_LIKELIHOOD_ORDER[4]
+	];
+	const xAxisLabels = ["Insig", "Minor", "Mod", "Major", "Severe"];
+
+	// Store the active cell position values
+	const activeProbability = vendor.residualProbability;
+	const activeImpact = vendor.residualImpact;
 
 	return (
-		<Card>
-			<CardHeader>
-				<div className="flex justify-between items-center">
-					<div>
-						<CardTitle>
-							<div className="flex items-center justify-between gap-2">
-								{t("vendors.risks.residual_risk")}
-								<Button
-									onClick={() => {
-										console.log("Residual risk edit button clicked");
-										setOpen("true");
-									}}
-									size="icon"
-									variant="ghost"
-									className="p-0 m-0 size-auto"
-								>
-									<PencilIcon className="h-3 w-3" />
-								</Button>
+		<>
+			<Card>
+				<CardHeader>
+					<div className="flex justify-between items-center">
+						<div className="w-full">
+							<CardTitle>
+								<div className="flex items-center justify-between gap-2">
+									{t("vendors.risks.residual_risk")}
+									<Button
+										onClick={() => setOpen("true")}
+										size="icon"
+										variant="ghost"
+										className="p-0 m-0 size-auto"
+									>
+										<PencilIcon className="h-4 w-4" />
+									</Button>
+								</div>
+							</CardTitle>
+							<CardDescription className="text-xs">
+								{t("vendors.risks.update_residual_risk_description")}
+							</CardDescription>
+						</div>
+					</div>
+				</CardHeader>
+				<CardContent>
+					<div className="mb-8">
+						{/* 5x5 Risk Matrix */}
+						<div className="relative w-full aspect-[1.5/1] max-h-[300px]">
+							{/* Y-axis label */}
+							<div className="absolute left-[-30px] top-1/2 -translate-y-1/2 -rotate-90 font-semibold text-sm text-muted-foreground z-10">
+								Probability
+							</div>
+
+							{/* Main grid container */}
+							<div className="absolute top-0 left-[90px] right-[10px] bottom-[35px]">
+								<div className="relative w-full h-full border-l border-b">
+									{/* Grid rows */}
+									{[...Array(5)].map((_, rowIndex) => {
+										// Map row index to likelihood enum based on visual order
+										const rowLikelihood = VISUAL_LIKELIHOOD_ORDER[rowIndex];
+
+										return (
+											<div
+												key={`row-${rowIndex}`}
+												className="h-[20%] flex border-t"
+											>
+												{/* Grid cells for this row */}
+												{[...Array(5)].map((_, colIndex) => {
+													// Map column index to impact enum
+													const colImpact = Object.keys(IMPACT_SCORES)[
+														colIndex
+													] as Impact;
+
+													// Calculate cell score and color
+													const likelihoodScore =
+														LIKELIHOOD_SCORES[rowLikelihood];
+													const impactScore = IMPACT_SCORES[colImpact];
+													const cellScore = likelihoodScore * impactScore;
+
+													let cellColor = RISK_COLORS.low;
+													if (cellScore > 16) cellColor = RISK_COLORS.critical;
+													else if (cellScore > 9) cellColor = RISK_COLORS.high;
+													else if (cellScore > 4)
+														cellColor = RISK_COLORS.medium;
+
+													// Check if this is the active cell
+													const isActive =
+														rowLikelihood === activeProbability &&
+														colImpact === activeImpact;
+
+													return (
+														<div
+															key={`cell-${rowIndex}-${colIndex}`}
+															className="w-[20%] border-r relative"
+															style={{ backgroundColor: `${cellColor}25` }}
+														>
+															{isActive && (
+																<div className="absolute inset-0 flex items-center justify-center">
+																	<div
+																		className="absolute inset-0 z-10 border-2"
+																		style={{
+																			backgroundColor: cellColor,
+																			borderColor: cellColor,
+																			opacity: 0.9,
+																		}}
+																	/>
+																</div>
+															)}
+														</div>
+													);
+												})}
+											</div>
+										);
+									})}
+
+									{/* Y-axis labels - positioned outside the grid */}
+									{yAxisLabels.map((label, i) => (
+										<div
+											key={`y-label-${i}`}
+											className="absolute text-sm text-right"
+											style={{
+												left: "-75px",
+												top: `${i * 20 + 10}%`,
+												transform: "translateY(-50%)",
+												width: "65px",
+											}}
+										>
+											{label}
+										</div>
+									))}
+
+									{/* X-axis labels */}
+									{xAxisLabels.map((label, i) => (
+										<div
+											key={`x-label-${i}`}
+											className="absolute text-sm text-center"
+											style={{
+												left: `${i * 20 + 10}%`,
+												bottom: "-25px",
+												transform: "translateX(-50%)",
+												width: "40px",
+											}}
+										>
+											{label}
+										</div>
+									))}
+
+									{/* X-axis title */}
+									<div
+										className="absolute font-semibold text-sm text-muted-foreground"
+										style={{
+											bottom: "-45px",
+											left: "50%",
+											transform: "translateX(-50%)",
+										}}
+									>
+										Impact
+									</div>
+								</div>
 							</div>
-						</CardTitle>
-						<CardDescription className="text-xs">
-							{t("vendors.risks.update_residual_risk_description")}
-						</CardDescription>
+						</div>
 					</div>
-				</div>
-			</CardHeader>
-			<CardContent>
-				<ChartContainer config={chartConfig}>
-					<RadarChart data={data}>
-						<PolarGrid gridType="polygon" />
-						<PolarAngleAxis
-							dataKey="metric"
-							tick={{ fill: "currentColor", fontSize: 12 }}
-						/>
-						<PolarRadiusAxis
-							domain={[0, 100]}
-							tick={{ fill: "currentColor", fontSize: 12 }}
-						/>
-						<Radar
-							name="risk"
-							dataKey="value"
-							stroke="var(--color-risk)"
-							fill="var(--color-risk)"
-							fillOpacity={0.5}
-						/>
-						<ChartTooltip
-							cursor={false}
-							content={<ChartTooltipContent indicator="line" />}
-						/>
-					</RadarChart>
-				</ChartContainer>
-				<ResidualRiskSheet
-					vendorId={vendor.id}
-					initialRisk={vendor}
-					onSuccess={handleSuccess}
-				/>
-			</CardContent>
-		</Card>
+				</CardContent>
+			</Card>
+			<ResidualRiskSheet vendorId={vendor.id} initialRisk={vendor} />
+		</>
 	);
 }
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/residual-risk.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/residual-risk.tsx
index 8be4641f8b..4fe6157dbc 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/residual-risk.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/residual-risk.tsx
@@ -15,7 +15,8 @@ import {
 import { X } from "lucide-react";
 import { ResidualRiskForm } from "@/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/forms/risks/residual-risk-form";
 import type { Vendor } from "@comp/db/types";
-import { useState } from "react";
+import { useQueryState } from "nuqs";
+import { useRouter, useSearchParams } from "next/navigation";
 
 export function ResidualRiskSheet({
 	vendorId,
@@ -27,19 +28,50 @@ export function ResidualRiskSheet({
 	onSuccess?: () => void;
 }) {
 	const t = useI18n();
+	const router = useRouter();
+	const searchParams = useSearchParams();
 	const isDesktop = useMediaQuery("(min-width: 768px)");
-	const [isOpen, setIsOpen] = useState(true);
+	const [open, setOpen] = useQueryState("residual-risk-sheet");
+	const isOpen = open === "true";
 
-	const handleClose = () => setIsOpen(false);
+	const handleClose = () => {
+		setOpen(null);
+
+		// Create new URLSearchParams without the residual-risk-sheet parameter
+		const params = new URLSearchParams(searchParams);
+		params.delete("residual-risk-sheet");
+
+		// Create the new URL path with the updated query parameters
+		const newPath =
+			window.location.pathname +
+			(params.toString() ? `?${params.toString()}` : "");
+
+		// Update the URL without refreshing the page
+		router.replace(newPath);
+	};
 
 	const handleFormSuccess = () => {
-		setIsOpen(false);
+		setOpen(null);
+
+		// Remove query params on success
+		const params = new URLSearchParams(searchParams);
+		params.delete("residual-risk-sheet");
+
+		const newPath =
+			window.location.pathname +
+			(params.toString() ? `?${params.toString()}` : "");
+
+		router.replace(newPath);
+
 		if (onSuccess) onSuccess();
 	};
 
 	if (isDesktop) {
 		return (
-			<Sheet open={isOpen} onOpenChange={setIsOpen}>
+			<Sheet
+				open={isOpen}
+				onOpenChange={(value) => (value ? setOpen("true") : handleClose())}
+			>
 				<SheetContent stack>
 					<SheetHeader className="mb-8">
 						<div className="flex justify-between items-center flex-row">
@@ -72,7 +104,10 @@ export function ResidualRiskSheet({
 	}
 
 	return (
-		<Drawer open={isOpen} onOpenChange={setIsOpen}>
+		<Drawer
+			open={isOpen}
+			onOpenChange={(value) => (value ? setOpen("true") : handleClose())}
+		>
 			<DrawerTitle hidden>
 				{t("vendors.risks.update_residual_risk")}
 			</DrawerTitle>
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/secondary-fields/secondary-fields.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/secondary-fields/secondary-fields.tsx
index 6019d4c087..2547557a14 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/secondary-fields/secondary-fields.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/secondary-fields/secondary-fields.tsx
@@ -1,33 +1,33 @@
 "use client";
 
 import { useI18n } from "@/locales/client";
-import type { User, Vendor } from "@comp/db/types";
+import type { Member, User, Vendor } from "@comp/db/types";
 import { Card, CardContent, CardHeader, CardTitle } from "@comp/ui/card";
 import { UpdateSecondaryFieldsForm } from "./update-secondary-fields-form";
 
 export function SecondaryFields({
-  vendor,
-  users,
+	vendor,
+	assignees,
 }: {
-  vendor: Vendor & { owner: User | null };
-  users: User[];
+	vendor: Vendor & { assignee: { user: User | null } | null };
+	assignees: (Member & { user: User })[];
 }) {
-  const t = useI18n();
+	const t = useI18n();
 
-  return (
-    <div className="space-y-4">
-      <Card>
-        <CardHeader>
-          <CardTitle>
-            <div className="flex items-center justify-between gap-2">
-              {t("risk.dashboard.overview")}
-            </div>
-          </CardTitle>
-        </CardHeader>
-        <CardContent>
-          <UpdateSecondaryFieldsForm vendor={vendor} users={users} />
-        </CardContent>
-      </Card>
-    </div>
-  );
+	return (
+		<div className="space-y-4">
+			<Card>
+				<CardHeader>
+					<CardTitle>
+						<div className="flex items-center justify-between gap-2">
+							{t("risk.dashboard.overview")}
+						</div>
+					</CardTitle>
+				</CardHeader>
+				<CardContent>
+					<UpdateSecondaryFieldsForm vendor={vendor} assignees={assignees} />
+				</CardContent>
+			</Card>
+		</div>
+	);
 }
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/secondary-fields/update-secondary-fields-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/secondary-fields/update-secondary-fields-form.tsx
index 4ace1b829d..4afcc3bcbd 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/secondary-fields/update-secondary-fields-form.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/secondary-fields/update-secondary-fields-form.tsx
@@ -1,24 +1,23 @@
 "use client";
 
-import { SelectUser } from "@/components/select-user";
 import { VENDOR_STATUS_TYPES, VendorStatus } from "@/components/vendor-status";
 import { useI18n } from "@/locales/client";
-import { VendorCategory, type User, type Vendor } from "@comp/db/types";
+import { Member, VendorCategory, type User, type Vendor } from "@comp/db/types";
 import { Button } from "@comp/ui/button";
 import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
+	Form,
+	FormControl,
+	FormField,
+	FormItem,
+	FormLabel,
+	FormMessage,
 } from "@comp/ui/form";
 import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
 } from "@comp/ui/select";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Loader2 } from "lucide-react";
@@ -26,172 +25,161 @@ import { useAction } from "next-safe-action/hooks";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import type { z } from "zod";
-import { updateVendorAction } from "../../actions/update-vendor-action";
+import { SelectAssignee } from "../../../../components/SelectAssignee";
 import { updateVendorSchema } from "../../actions/schema";
+import { updateVendorAction } from "../../actions/update-vendor-action";
 
 export function UpdateSecondaryFieldsForm({
-  vendor,
-  users,
+	vendor,
+	assignees,
 }: {
-  vendor: Vendor & { owner: User | null };
-  users: User[];
+	vendor: Vendor;
+	assignees: (Member & { user: User })[];
 }) {
-  const t = useI18n();
+	const t = useI18n();
 
-  const updateVendor = useAction(updateVendorAction, {
-    onSuccess: () => {
-      toast.success(t("vendors.form.update_vendor_success"));
-    },
-    onError: () => {
-      toast.error(t("vendors.form.update_vendor_error"));
-    },
-  });
+	const updateVendor = useAction(updateVendorAction, {
+		onSuccess: () => {
+			toast.success(t("vendors.form.update_vendor_success"));
+		},
+		onError: () => {
+			toast.error(t("vendors.form.update_vendor_error"));
+		},
+	});
 
-  const form = useForm<z.infer<typeof updateVendorSchema>>({
-    resolver: zodResolver(updateVendorSchema),
-    defaultValues: {
-      id: vendor.id,
-      name: vendor.name,
-      description: vendor.description,
-      assigneeId: vendor.ownerId ?? undefined,
-      category: vendor.category,
-      status: vendor.status,
-    },
-  });
+	const form = useForm<z.infer<typeof updateVendorSchema>>({
+		resolver: zodResolver(updateVendorSchema),
+		defaultValues: {
+			id: vendor.id,
+			name: vendor.name,
+			description: vendor.description,
+			assigneeId: vendor.assigneeId,
+			category: vendor.category,
+			status: vendor.status,
+		},
+	});
 
-  const onSubmit = (data: z.infer<typeof updateVendorSchema>) => {
-    updateVendor.execute({
-      id: data.id,
-      name: data.name,
-      description: data.description,
-      assigneeId: data.assigneeId,
-      category: data.category,
-      status: data.status,
-    });
-  };
+	const onSubmit = (data: z.infer<typeof updateVendorSchema>) => {
+		updateVendor.execute({
+			id: data.id,
+			name: data.name,
+			description: data.description,
+			assigneeId: data.assigneeId,
+			category: data.category,
+			status: data.status,
+		});
+	};
 
-  return (
-    <Form {...form}>
-      <form onSubmit={form.handleSubmit(onSubmit)}>
-        <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-          <FormField
-            control={form.control}
-            name="assigneeId"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>{t("common.assignee.label")}</FormLabel>
-                <FormControl>
-                  <Select
-                    value={field.value ?? undefined}
-                    onValueChange={field.onChange}
-                    onOpenChange={() => form.handleSubmit(onSubmit)}
-                  >
-                    <SelectTrigger>
-                      <SelectValue
-                        placeholder={t("common.assignee.placeholder")}
-                      />
-                    </SelectTrigger>
-                    <SelectContent>
-                      <SelectUser
-                        isLoading={false}
-                        onSelect={field.onChange}
-                        selectedId={field.value ?? undefined}
-                        users={users}
-                      />
-                    </SelectContent>
-                  </Select>
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-          <FormField
-            control={form.control}
-            name="status"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>{t("vendors.form.vendor_status")}</FormLabel>
-                <FormControl>
-                  <Select value={field.value} onValueChange={field.onChange}>
-                    <SelectTrigger>
-                      <SelectValue
-                        placeholder={t(
-                          "vendors.form.vendor_status_placeholder",
-                        )}
-                      >
-                        {field.value && <VendorStatus status={field.value} />}
-                      </SelectValue>
-                    </SelectTrigger>
-                    <SelectContent>
-                      {Object.values(VENDOR_STATUS_TYPES).map((status) => (
-                        <SelectItem key={status} value={status}>
-                          <VendorStatus status={status} />
-                        </SelectItem>
-                      ))}
-                    </SelectContent>
-                  </Select>
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-          <FormField
-            control={form.control}
-            name="category"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>{t("vendors.form.vendor_category")}</FormLabel>
-                <FormControl>
-                  <Select
-                    {...field}
-                    value={field.value}
-                    onValueChange={field.onChange}
-                  >
-                    <SelectTrigger>
-                      <SelectValue
-                        placeholder={t(
-                          "vendors.form.vendor_category_placeholder",
-                        )}
-                      />
-                    </SelectTrigger>
-                    <SelectContent>
-                      {Object.values(VendorCategory).map((category) => {
-                        const formattedCategory = category
-                          .toLowerCase()
-                          .split("_")
-                          .map(
-                            (word) =>
-                              word.charAt(0).toUpperCase() + word.slice(1),
-                          )
-                          .join(" ");
-                        return (
-                          <SelectItem key={category} value={category}>
-                            {formattedCategory}
-                          </SelectItem>
-                        );
-                      })}
-                    </SelectContent>
-                  </Select>
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-        </div>
-        <div className="flex justify-end mt-4">
-          <Button
-            type="submit"
-            variant="action"
-            disabled={updateVendor.status === "executing"}
-          >
-            {updateVendor.status === "executing" ? (
-              <Loader2 className="h-4 w-4 animate-spin" />
-            ) : (
-              t("common.actions.save")
-            )}
-          </Button>
-        </div>
-      </form>
-    </Form>
-  );
+	return (
+		<Form {...form}>
+			<form onSubmit={form.handleSubmit(onSubmit)}>
+				<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+					<FormField
+						control={form.control}
+						name="assigneeId"
+						render={({ field }) => (
+							<FormItem>
+								<FormLabel>{t("common.assignee.label")}</FormLabel>
+								<FormControl>
+									<SelectAssignee
+										disabled={updateVendor.status === "executing"}
+										withTitle={false}
+										assignees={assignees}
+										assigneeId={field.value}
+										onAssigneeChange={field.onChange}
+									/>
+								</FormControl>
+								<FormMessage />
+							</FormItem>
+						)}
+					/>
+					<FormField
+						control={form.control}
+						name="status"
+						render={({ field }) => (
+							<FormItem>
+								<FormLabel>{t("vendors.form.vendor_status")}</FormLabel>
+								<FormControl>
+									<Select value={field.value} onValueChange={field.onChange}>
+										<SelectTrigger>
+											<SelectValue
+												placeholder={t(
+													"vendors.form.vendor_status_placeholder",
+												)}
+											>
+												{field.value && <VendorStatus status={field.value} />}
+											</SelectValue>
+										</SelectTrigger>
+										<SelectContent>
+											{Object.values(VENDOR_STATUS_TYPES).map((status) => (
+												<SelectItem key={status} value={status}>
+													<VendorStatus status={status} />
+												</SelectItem>
+											))}
+										</SelectContent>
+									</Select>
+								</FormControl>
+								<FormMessage />
+							</FormItem>
+						)}
+					/>
+					<FormField
+						control={form.control}
+						name="category"
+						render={({ field }) => (
+							<FormItem>
+								<FormLabel>{t("vendors.form.vendor_category")}</FormLabel>
+								<FormControl>
+									<Select
+										{...field}
+										value={field.value}
+										onValueChange={field.onChange}
+									>
+										<SelectTrigger>
+											<SelectValue
+												placeholder={t(
+													"vendors.form.vendor_category_placeholder",
+												)}
+											/>
+										</SelectTrigger>
+										<SelectContent>
+											{Object.values(VendorCategory).map((category) => {
+												const formattedCategory = category
+													.toLowerCase()
+													.split("_")
+													.map(
+														(word) =>
+															word.charAt(0).toUpperCase() + word.slice(1),
+													)
+													.join(" ");
+												return (
+													<SelectItem key={category} value={category}>
+														{formattedCategory}
+													</SelectItem>
+												);
+											})}
+										</SelectContent>
+									</Select>
+								</FormControl>
+								<FormMessage />
+							</FormItem>
+						)}
+					/>
+				</div>
+				<div className="flex justify-end mt-4">
+					<Button
+						type="submit"
+						variant="action"
+						disabled={updateVendor.status === "executing"}
+					>
+						{updateVendor.status === "executing" ? (
+							<Loader2 className="h-4 w-4 animate-spin" />
+						) : (
+							t("common.actions.save")
+						)}
+					</Button>
+				</div>
+			</form>
+		</Form>
+	);
 }
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/tasks/create-vendor-task-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/tasks/create-vendor-task-form.tsx
index cb33a51829..619d3e064f 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/tasks/create-vendor-task-form.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/tasks/create-vendor-task-form.tsx
@@ -6,29 +6,29 @@ import { createVendorTaskSchema } from "../../actions/schema";
 import { SelectUser } from "@/components/select-user";
 import { useI18n } from "@/locales/client";
 import {
-  Accordion,
-  AccordionContent,
-  AccordionItem,
-  AccordionTrigger,
+	Accordion,
+	AccordionContent,
+	AccordionItem,
+	AccordionTrigger,
 } from "@comp/ui/accordion";
 import { Button } from "@comp/ui/button";
 import { Calendar } from "@comp/ui/calendar";
 import { cn } from "@comp/ui/cn";
 import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
+	Form,
+	FormControl,
+	FormField,
+	FormItem,
+	FormLabel,
+	FormMessage,
 } from "@comp/ui/form";
 import { Input } from "@comp/ui/input";
 import { Popover, PopoverContent, PopoverTrigger } from "@comp/ui/popover";
 import {
-  Select,
-  SelectContent,
-  SelectTrigger,
-  SelectValue,
+	Select,
+	SelectContent,
+	SelectTrigger,
+	SelectValue,
 } from "@comp/ui/select";
 import { Textarea } from "@comp/ui/textarea";
 import { zodResolver } from "@hookform/resolvers/zod";
@@ -41,211 +41,185 @@ import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import type { z } from "zod";
+import { SelectAssignee } from "../../../../components/SelectAssignee";
+import { Member, User } from "@comp/db/types";
 
-interface User {
-  id: string;
-  image?: string | null;
-  name: string | null;
-}
-
-export function CreateVendorTaskForm() {
-  const t = useI18n();
-
-  const [users, setUsers] = useState<User[]>([]);
-  const [isLoadingUsers, setIsLoadingUsers] = useState(true);
-  const [_, setCreateVendorTaskSheet] = useQueryState(
-    "create-vendor-task-sheet",
-  );
-  const params = useParams<{ vendorId: string }>();
-
-  useEffect(() => {
-    async function loadUsers() {
-      const result = await getOrganizationUsersAction();
-      if (result?.data?.success && result?.data?.data) {
-        setUsers(result.data.data);
-      }
-      setIsLoadingUsers(false);
-    }
+export function CreateVendorTaskForm({
+	assignees,
+}: {
+	assignees: (Member & { user: User })[];
+}) {
+	const t = useI18n();
 
-    loadUsers();
-  }, []);
+	const [_, setCreateVendorTaskSheet] = useQueryState(
+		"create-vendor-task-sheet",
+	);
+	const params = useParams<{ vendorId: string }>();
 
-  const createTask = useAction(createVendorTaskAction, {
-    onSuccess: () => {
-      toast.success(t("risk.tasks.form.success"));
-      setCreateVendorTaskSheet(null);
-    },
-    onError: () => {
-      toast.error(t("risk.tasks.form.error"));
-    },
-  });
+	const createTask = useAction(createVendorTaskAction, {
+		onSuccess: () => {
+			toast.success(t("risk.tasks.form.success"));
+			setCreateVendorTaskSheet(null);
+		},
+		onError: () => {
+			toast.error(t("risk.tasks.form.error"));
+		},
+	});
 
-  const form = useForm<z.infer<typeof createVendorTaskSchema>>({
-    resolver: zodResolver(createVendorTaskSchema),
-    defaultValues: {
-      title: "",
-      description: "",
-      dueDate: new Date(),
-      assigneeId: "",
-      vendorId: params.vendorId,
-    },
-  });
+	const form = useForm<z.infer<typeof createVendorTaskSchema>>({
+		resolver: zodResolver(createVendorTaskSchema),
+		defaultValues: {
+			title: "",
+			description: "",
+			dueDate: new Date(),
+			assigneeId: "",
+			vendorId: params.vendorId,
+		},
+	});
 
-  const onSubmit = (data: z.infer<typeof createVendorTaskSchema>) => {
-    createTask.execute(data);
-  };
+	const onSubmit = (data: z.infer<typeof createVendorTaskSchema>) => {
+		createTask.execute(data);
+	};
 
-  return (
-    <Form {...form}>
-      <form onSubmit={form.handleSubmit(onSubmit)}>
-        <div className="h-[calc(100vh-250px)] scrollbar-hide overflow-auto">
-          <div>
-            <Accordion type="multiple" defaultValue={["task"]}>
-              <AccordionItem value="task">
-                <AccordionTrigger>
-                  {t("risk.tasks.form.title")}
-                </AccordionTrigger>
-                <AccordionContent>
-                  <div className="space-y-4">
-                    <FormField
-                      control={form.control}
-                      name="title"
-                      render={({ field }) => (
-                        <FormItem>
-                          <FormLabel>
-                            {t("risk.tasks.form.task_title")}
-                          </FormLabel>
-                          <FormControl>
-                            <Input
-                              {...field}
-                              autoFocus
-                              className="mt-3"
-                              placeholder={t(
-                                "risk.tasks.form.task_title_description",
-                              )}
-                              autoCorrect="off"
-                            />
-                          </FormControl>
-                          <FormMessage />
-                        </FormItem>
-                      )}
-                    />
+	return (
+		<Form {...form}>
+			<form onSubmit={form.handleSubmit(onSubmit)}>
+				<div className="h-[calc(100vh-250px)] scrollbar-hide overflow-auto">
+					<div>
+						<Accordion type="multiple" defaultValue={["task"]}>
+							<AccordionItem value="task">
+								<AccordionTrigger>
+									{t("risk.tasks.form.title")}
+								</AccordionTrigger>
+								<AccordionContent>
+									<div className="space-y-4">
+										<FormField
+											control={form.control}
+											name="title"
+											render={({ field }) => (
+												<FormItem>
+													<FormLabel>
+														{t("risk.tasks.form.task_title")}
+													</FormLabel>
+													<FormControl>
+														<Input
+															{...field}
+															autoFocus
+															className="mt-3"
+															placeholder={t(
+																"risk.tasks.form.task_title_description",
+															)}
+															autoCorrect="off"
+														/>
+													</FormControl>
+													<FormMessage />
+												</FormItem>
+											)}
+										/>
 
-                    <FormField
-                      control={form.control}
-                      name="description"
-                      render={({ field }) => (
-                        <FormItem>
-                          <FormLabel>
-                            {t("risk.tasks.form.description")}
-                          </FormLabel>
-                          <FormControl>
-                            <Textarea
-                              {...field}
-                              className="mt-3 min-h-[80px]"
-                              placeholder={t(
-                                "risk.tasks.form.description_description",
-                              )}
-                            />
-                          </FormControl>
-                          <FormMessage />
-                        </FormItem>
-                      )}
-                    />
+										<FormField
+											control={form.control}
+											name="description"
+											render={({ field }) => (
+												<FormItem>
+													<FormLabel>
+														{t("risk.tasks.form.description")}
+													</FormLabel>
+													<FormControl>
+														<Textarea
+															{...field}
+															className="mt-3 min-h-[80px]"
+															placeholder={t(
+																"risk.tasks.form.description_description",
+															)}
+														/>
+													</FormControl>
+													<FormMessage />
+												</FormItem>
+											)}
+										/>
 
-                    <FormField
-                      control={form.control}
-                      name="dueDate"
-                      render={({ field }) => (
-                        <FormItem className="flex flex-col">
-                          <FormLabel>{t("risk.tasks.form.due_date")}</FormLabel>
-                          <Popover>
-                            <PopoverTrigger asChild>
-                              <FormControl>
-                                <Button
-                                  variant={"outline"}
-                                  className={cn(
-                                    "w-[240px] pl-3 text-left font-normal",
-                                    !field.value && "text-muted-foreground",
-                                  )}
-                                >
-                                  {field.value ? (
-                                    format(field.value, "PPP")
-                                  ) : (
-                                    <span>{t("common.date.pick")}</span>
-                                  )}
-                                  <CalendarIcon className="ml-auto h-4 w-4 opacity-50" />
-                                </Button>
-                              </FormControl>
-                            </PopoverTrigger>
-                            <PopoverContent
-                              className="w-auto p-0"
-                              align="start"
-                            >
-                              <Calendar
-                                mode="single"
-                                selected={field.value}
-                                onSelect={field.onChange}
-                                disabled={(date) => date <= new Date()}
-                                initialFocus
-                              />
-                            </PopoverContent>
-                          </Popover>
-                          <FormMessage />
-                        </FormItem>
-                      )}
-                    />
+										<FormField
+											control={form.control}
+											name="dueDate"
+											render={({ field }) => (
+												<FormItem className="flex flex-col">
+													<FormLabel>{t("risk.tasks.form.due_date")}</FormLabel>
+													<Popover>
+														<PopoverTrigger asChild>
+															<FormControl>
+																<Button
+																	variant={"outline"}
+																	className={cn(
+																		"w-[240px] pl-3 text-left font-normal",
+																		!field.value && "text-muted-foreground",
+																	)}
+																>
+																	{field.value ? (
+																		format(field.value, "PPP")
+																	) : (
+																		<span>{t("common.date.pick")}</span>
+																	)}
+																	<CalendarIcon className="ml-auto h-4 w-4 opacity-50" />
+																</Button>
+															</FormControl>
+														</PopoverTrigger>
+														<PopoverContent
+															className="w-auto p-0"
+															align="start"
+														>
+															<Calendar
+																mode="single"
+																selected={field.value}
+																onSelect={field.onChange}
+																disabled={(date) => date <= new Date()}
+																initialFocus
+															/>
+														</PopoverContent>
+													</Popover>
+													<FormMessage />
+												</FormItem>
+											)}
+										/>
 
-                    <FormField
-                      control={form.control}
-                      name="assigneeId"
-                      render={({ field }) => (
-                        <FormItem>
-                          <FormLabel>{t("common.assignee.label")}</FormLabel>
-                          <FormControl>
-                            <Select
-                              value={field.value ?? ""}
-                              onValueChange={field.onChange}
-                            >
-                              <SelectTrigger>
-                                <SelectValue
-                                  placeholder={t("common.assignee.placeholder")}
-                                />
-                              </SelectTrigger>
-                              <SelectContent>
-                                <SelectUser
-                                  users={users}
-                                  isLoading={isLoadingUsers}
-                                  onSelect={field.onChange}
-                                  selectedId={field.value ?? undefined}
-                                />
-                              </SelectContent>
-                            </Select>
-                          </FormControl>
-                          <FormMessage />
-                        </FormItem>
-                      )}
-                    />
-                  </div>
-                </AccordionContent>
-              </AccordionItem>
-            </Accordion>
-          </div>
+										<FormField
+											control={form.control}
+											name="assigneeId"
+											render={({ field }) => (
+												<FormItem>
+													<FormLabel>{t("common.assignee.label")}</FormLabel>
+													<FormControl>
+														<SelectAssignee
+															assignees={assignees}
+															assigneeId={field.value}
+															onAssigneeChange={field.onChange}
+															withTitle={false}
+														/>
+													</FormControl>
+													<FormMessage />
+												</FormItem>
+											)}
+										/>
+									</div>
+								</AccordionContent>
+							</AccordionItem>
+						</Accordion>
+					</div>
 
-          <div className="flex justify-end mt-4">
-            <Button
-              type="submit"
-              variant="action"
-              disabled={createTask.status === "executing"}
-            >
-              <div className="flex items-center justify-center">
-                {t("common.actions.create")}
-                <ArrowRightIcon className="ml-2 h-4 w-4" />
-              </div>
-            </Button>
-          </div>
-        </div>
-      </form>
-    </Form>
-  );
+					<div className="flex justify-end mt-4">
+						<Button
+							type="submit"
+							variant="action"
+							disabled={createTask.status === "executing"}
+						>
+							<div className="flex items-center justify-center">
+								{t("common.actions.create")}
+								<ArrowRightIcon className="ml-2 h-4 w-4" />
+							</div>
+						</Button>
+					</div>
+				</div>
+			</form>
+		</Form>
+	);
 }
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/title-and-description/title-and-description.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/title-and-description/title-and-description.tsx
index be9f3c2ca8..c83833f2f7 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/title-and-description/title-and-description.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/title-and-description/title-and-description.tsx
@@ -12,7 +12,7 @@ import { UpdateTitleAndDescriptionSheet } from "./update-title-and-description-s
 export function TitleAndDescription({
 	vendor,
 }: {
-	vendor: Vendor & { owner: User | null };
+	vendor: Vendor & { assignee: { user: User | null } | null };
 }) {
 	const t = useI18n();
 	const [_, setOpen] = useQueryState("vendor-overview-sheet");
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/title-and-description/update-title-and-description-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/title-and-description/update-title-and-description-form.tsx
index 54df7ae60a..cf65bc5f33 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/title-and-description/update-title-and-description-form.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/title-and-description/update-title-and-description-form.tsx
@@ -4,12 +4,12 @@ import { useI18n } from "@/locales/client";
 import type { Vendor } from "@comp/db/types";
 import { Button } from "@comp/ui/button";
 import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
+	Form,
+	FormControl,
+	FormField,
+	FormItem,
+	FormLabel,
+	FormMessage,
 } from "@comp/ui/form";
 import { Input } from "@comp/ui/input";
 import { Textarea } from "@comp/ui/textarea";
@@ -24,101 +24,101 @@ import { updateVendorAction } from "../../actions/update-vendor-action";
 import { updateVendorSchema } from "../../actions/schema";
 
 export function UpdateTitleAndDescriptionForm({
-  vendor,
+	vendor,
 }: {
-  vendor: Vendor;
+	vendor: Vendor;
 }) {
-  const t = useI18n();
-  const [open, setOpen] = useQueryState("vendor-overview-sheet");
+	const t = useI18n();
+	const [open, setOpen] = useQueryState("vendor-overview-sheet");
 
-  const updateVendor = useAction(updateVendorAction, {
-    onSuccess: () => {
-      toast.success(t("vendors.form.update_vendor_success"));
-      setOpen(null);
-    },
-    onError: (error) => {
-      console.error("Error updating vendor:", error);
-      toast.error(t("vendors.form.update_vendor_error"));
-    },
-  });
+	const updateVendor = useAction(updateVendorAction, {
+		onSuccess: () => {
+			toast.success(t("vendors.form.update_vendor_success"));
+			setOpen(null);
+		},
+		onError: (error) => {
+			console.error("Error updating vendor:", error);
+			toast.error(t("vendors.form.update_vendor_error"));
+		},
+	});
 
-  const form = useForm<z.infer<typeof updateVendorSchema>>({
-    resolver: zodResolver(updateVendorSchema),
-    defaultValues: {
-      id: vendor.id,
-      name: vendor.name,
-      description: vendor.description,
-      category: vendor.category,
-      status: vendor.status,
-      assigneeId: vendor.ownerId ?? undefined,
-    },
-  });
+	const form = useForm<z.infer<typeof updateVendorSchema>>({
+		resolver: zodResolver(updateVendorSchema),
+		defaultValues: {
+			id: vendor.id,
+			name: vendor.name,
+			description: vendor.description,
+			category: vendor.category,
+			status: vendor.status,
+			assigneeId: vendor.assigneeId,
+		},
+	});
 
-  const onSubmit = (data: z.infer<typeof updateVendorSchema>) => {
-    console.log("Form submitted with data:", data);
-    updateVendor.execute({
-      id: data.id,
-      name: data.name,
-      description: data.description,
-      category: data.category,
-      status: data.status,
-      assigneeId: data.assigneeId,
-    });
-  };
+	const onSubmit = (data: z.infer<typeof updateVendorSchema>) => {
+		console.log("Form submitted with data:", data);
+		updateVendor.execute({
+			id: data.id,
+			name: data.name,
+			description: data.description,
+			category: data.category,
+			status: data.status,
+			assigneeId: data.assigneeId,
+		});
+	};
 
-  return (
-    <Form {...form}>
-      <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-        <FormField
-          control={form.control}
-          name="name"
-          render={({ field }) => (
-            <FormItem>
-              <FormLabel>{t("vendors.form.vendor_name")}</FormLabel>
-              <FormControl>
-                <Input
-                  {...field}
-                  autoFocus
-                  className="mt-3"
-                  placeholder={t("vendors.form.vendor_name_description")}
-                  autoCorrect="off"
-                />
-              </FormControl>
-              <FormMessage />
-            </FormItem>
-          )}
-        />
-        <FormField
-          control={form.control}
-          name="description"
-          render={({ field }) => (
-            <FormItem>
-              <FormLabel>{t("vendors.form.vendor_description")}</FormLabel>
-              <FormControl>
-                <Textarea
-                  {...field}
-                  className="mt-3 min-h-[80px]"
-                  placeholder={t("vendors.form.vendor_description_description")}
-                />
-              </FormControl>
-              <FormMessage />
-            </FormItem>
-          )}
-        />
-        <div className="flex justify-end mt-8">
-          <Button
-            type="submit"
-            variant="action"
-            disabled={updateVendor.status === "executing"}
-          >
-            {updateVendor.status === "executing" ? (
-              <Loader2 className="h-4 w-4 animate-spin" />
-            ) : (
-              t("common.actions.save")
-            )}
-          </Button>
-        </div>
-      </form>
-    </Form>
-  );
+	return (
+		<Form {...form}>
+			<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
+				<FormField
+					control={form.control}
+					name="name"
+					render={({ field }) => (
+						<FormItem>
+							<FormLabel>{t("vendors.form.vendor_name")}</FormLabel>
+							<FormControl>
+								<Input
+									{...field}
+									autoFocus
+									className="mt-3"
+									placeholder={t("vendors.form.vendor_name_description")}
+									autoCorrect="off"
+								/>
+							</FormControl>
+							<FormMessage />
+						</FormItem>
+					)}
+				/>
+				<FormField
+					control={form.control}
+					name="description"
+					render={({ field }) => (
+						<FormItem>
+							<FormLabel>{t("vendors.form.vendor_description")}</FormLabel>
+							<FormControl>
+								<Textarea
+									{...field}
+									className="mt-3 min-h-[80px]"
+									placeholder={t("vendors.form.vendor_description_description")}
+								/>
+							</FormControl>
+							<FormMessage />
+						</FormItem>
+					)}
+				/>
+				<div className="flex justify-end mt-8">
+					<Button
+						type="submit"
+						variant="action"
+						disabled={updateVendor.status === "executing"}
+					>
+						{updateVendor.status === "executing" ? (
+							<Loader2 className="h-4 w-4 animate-spin" />
+						) : (
+							t("common.actions.save")
+						)}
+					</Button>
+				</div>
+			</form>
+		</Form>
+	);
 }
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/forms/risks/inherent-risk-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/forms/risks/inherent-risk-form.tsx
index b5b81381cb..ac093b73d7 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/forms/risks/inherent-risk-form.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/forms/risks/inherent-risk-form.tsx
@@ -19,12 +19,13 @@ import {
 } from "@comp/ui/select";
 import { useToast } from "@comp/ui/use-toast";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { useRouter } from "next/navigation";
+import { useRouter, useSearchParams } from "next/navigation";
 import { useForm } from "react-hook-form";
 import { z } from "zod";
 import { updateVendorInherentRisk } from "@/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/update-vendor-inherent-risk";
 import type { ActionResponse } from "@/types/actions";
 import { Impact, Likelihood } from "@prisma/client";
+import { useQueryState } from "nuqs";
 
 const formSchema = z.object({
 	inherentProbability: z.nativeEnum(Likelihood),
@@ -49,6 +50,8 @@ export function InherentRiskForm({
 	const t = useI18n();
 	const { toast } = useToast();
 	const router = useRouter();
+	const searchParams = useSearchParams();
+	const [_, setOpen] = useQueryState("inherent-risk-sheet");
 
 	const form = useForm<FormValues>({
 		resolver: zodResolver(formSchema),
@@ -60,6 +63,7 @@ export function InherentRiskForm({
 
 	async function onSubmit(values: FormValues) {
 		try {
+			// Call the server action
 			const response = await updateVendorInherentRisk({
 				vendorId,
 				inherentProbability: values.inherentProbability,
@@ -68,24 +72,35 @@ export function InherentRiskForm({
 
 			const result = response as unknown as ActionResponse;
 
-			if (!result.success) {
+			if (!result?.success) {
 				toast({
 					title: t("common.error"),
-					description: result.error || t("common.unexpected_error"),
+					description: result?.error || t("common.unexpected_error"),
 					variant: "destructive",
 				});
-				return;
+				return; // Stop execution on failure
 			}
 
+			// On success:
+			// 1. Show success toast
 			toast({
 				title: t("common.success"),
 				description: t("vendors.risks.inherent_risk_updated"),
 			});
 
-			if (onSuccess) onSuccess();
-
+			// 2. Refresh the page data first to ensure it's updated before navigation
 			router.refresh();
+
+			// 3. Close the sheet by navigating to the same route without the query parameter
+			const params = new URLSearchParams(searchParams);
+			params.delete("inherent-risk-sheet");
+			const newPath = `${window.location.pathname}${params.size > 0 ? `?${params.toString()}` : ""}`;
+			router.replace(newPath, { scroll: false });
+
+			// 4. Call onSuccess callback if provided (optional, might not be needed if navigation handles updates)
+			if (onSuccess) onSuccess();
 		} catch (error) {
+			console.error("Error submitting form:", error);
 			toast({
 				title: t("common.error"),
 				description: t("common.unexpected_error"),
@@ -102,8 +117,14 @@ export function InherentRiskForm({
 					name="inherentProbability"
 					render={({ field }) => (
 						<FormItem>
-							<FormLabel>{t("vendors.risks.inherent_probability")}</FormLabel>
-							<Select onValueChange={field.onChange} defaultValue={field.value}>
+							<FormLabel>
+								{t("vendors.risks.inherent_probability")} (Vertical Axis)
+							</FormLabel>
+							<Select
+								onValueChange={field.onChange}
+								defaultValue={field.value}
+								value={field.value}
+							>
 								<FormControl>
 									<SelectTrigger>
 										<SelectValue
@@ -112,20 +133,20 @@ export function InherentRiskForm({
 									</SelectTrigger>
 								</FormControl>
 								<SelectContent>
-									<SelectItem value={Likelihood.very_unlikely}>
-										{t("vendors.risks.very_unlikely")}
+									<SelectItem value={Likelihood.very_likely}>
+										{t("vendors.risks.very_likely")} (Top row)
 									</SelectItem>
-									<SelectItem value={Likelihood.unlikely}>
-										{t("vendors.risks.unlikely")}
+									<SelectItem value={Likelihood.likely}>
+										{t("vendors.risks.likely")}
 									</SelectItem>
 									<SelectItem value={Likelihood.possible}>
 										{t("vendors.risks.possible")}
 									</SelectItem>
-									<SelectItem value={Likelihood.likely}>
-										{t("vendors.risks.likely")}
+									<SelectItem value={Likelihood.unlikely}>
+										{t("vendors.risks.unlikely")}
 									</SelectItem>
-									<SelectItem value={Likelihood.very_likely}>
-										{t("vendors.risks.very_likely")}
+									<SelectItem value={Likelihood.very_unlikely}>
+										{t("vendors.risks.very_unlikely")} (Bottom row)
 									</SelectItem>
 								</SelectContent>
 							</Select>
@@ -139,8 +160,14 @@ export function InherentRiskForm({
 					name="inherentImpact"
 					render={({ field }) => (
 						<FormItem>
-							<FormLabel>{t("vendors.risks.inherent_impact")}</FormLabel>
-							<Select onValueChange={field.onChange} defaultValue={field.value}>
+							<FormLabel>
+								{t("vendors.risks.inherent_impact")} (Horizontal Axis)
+							</FormLabel>
+							<Select
+								onValueChange={field.onChange}
+								defaultValue={field.value}
+								value={field.value}
+							>
 								<FormControl>
 									<SelectTrigger>
 										<SelectValue
@@ -150,7 +177,7 @@ export function InherentRiskForm({
 								</FormControl>
 								<SelectContent>
 									<SelectItem value={Impact.insignificant}>
-										{t("vendors.risks.insignificant")}
+										{t("vendors.risks.insignificant")} (Left column)
 									</SelectItem>
 									<SelectItem value={Impact.minor}>
 										{t("vendors.risks.minor")}
@@ -162,7 +189,7 @@ export function InherentRiskForm({
 										{t("vendors.risks.major")}
 									</SelectItem>
 									<SelectItem value={Impact.severe}>
-										{t("vendors.risks.severe")}
+										{t("vendors.risks.severe")} (Right column)
 									</SelectItem>
 								</SelectContent>
 							</Select>
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/forms/risks/residual-risk-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/forms/risks/residual-risk-form.tsx
index 91392fb972..34348c68c9 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/forms/risks/residual-risk-form.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/forms/risks/residual-risk-form.tsx
@@ -19,12 +19,13 @@ import {
 } from "@comp/ui/select";
 import { useToast } from "@comp/ui/use-toast";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { useRouter } from "next/navigation";
+import { useRouter, useSearchParams } from "next/navigation";
 import { useForm } from "react-hook-form";
 import { z } from "zod";
 import { updateVendorResidualRisk } from "@/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/update-vendor-residual-risk";
 import type { ActionResponse } from "@/types/actions";
 import { Impact, Likelihood } from "@prisma/client";
+import { useQueryState } from "nuqs";
 
 const formSchema = z.object({
 	residualProbability: z.nativeEnum(Likelihood),
@@ -49,6 +50,8 @@ export function ResidualRiskForm({
 	const t = useI18n();
 	const { toast } = useToast();
 	const router = useRouter();
+	const searchParams = useSearchParams();
+	const [_, setOpen] = useQueryState("residual-risk-sheet");
 
 	const form = useForm<FormValues>({
 		resolver: zodResolver(formSchema),
@@ -60,6 +63,7 @@ export function ResidualRiskForm({
 
 	async function onSubmit(values: FormValues) {
 		try {
+			// Call the server action
 			const response = await updateVendorResidualRisk({
 				vendorId,
 				residualProbability: values.residualProbability,
@@ -68,24 +72,35 @@ export function ResidualRiskForm({
 
 			const result = response as unknown as ActionResponse;
 
-			if (!result.success) {
+			if (!result?.success) {
 				toast({
 					title: t("common.error"),
-					description: result.error || t("common.unexpected_error"),
+					description: result?.error || t("common.unexpected_error"),
 					variant: "destructive",
 				});
-				return;
+				return; // Stop execution on failure
 			}
 
+			// On success:
+			// 1. Show success toast
 			toast({
 				title: t("common.success"),
 				description: t("vendors.risks.residual_risk_updated"),
 			});
 
-			if (onSuccess) onSuccess();
-
+			// 2. Refresh the page data first to ensure it's updated before navigation
 			router.refresh();
+
+			// 3. Close the sheet by navigating to the same route without the query parameter
+			const params = new URLSearchParams(searchParams);
+			params.delete("residual-risk-sheet");
+			const newPath = `${window.location.pathname}${params.size > 0 ? `?${params.toString()}` : ""}`;
+			router.replace(newPath, { scroll: false });
+
+			// 4. Call onSuccess callback if provided (optional, might not be needed if navigation handles updates)
+			if (onSuccess) onSuccess();
 		} catch (error) {
+			console.error("Error submitting form:", error);
 			toast({
 				title: t("common.error"),
 				description: t("common.unexpected_error"),
@@ -102,8 +117,14 @@ export function ResidualRiskForm({
 					name="residualProbability"
 					render={({ field }) => (
 						<FormItem>
-							<FormLabel>{t("vendors.risks.residual_probability")}</FormLabel>
-							<Select onValueChange={field.onChange} defaultValue={field.value}>
+							<FormLabel>
+								{t("vendors.risks.residual_probability")} (Vertical Axis)
+							</FormLabel>
+							<Select
+								onValueChange={field.onChange}
+								defaultValue={field.value}
+								value={field.value}
+							>
 								<FormControl>
 									<SelectTrigger>
 										<SelectValue
@@ -112,20 +133,20 @@ export function ResidualRiskForm({
 									</SelectTrigger>
 								</FormControl>
 								<SelectContent>
-									<SelectItem value={Likelihood.very_unlikely}>
-										{t("vendors.risks.very_unlikely")}
+									<SelectItem value={Likelihood.very_likely}>
+										{t("vendors.risks.very_likely")} (Top row)
 									</SelectItem>
-									<SelectItem value={Likelihood.unlikely}>
-										{t("vendors.risks.unlikely")}
+									<SelectItem value={Likelihood.likely}>
+										{t("vendors.risks.likely")}
 									</SelectItem>
 									<SelectItem value={Likelihood.possible}>
 										{t("vendors.risks.possible")}
 									</SelectItem>
-									<SelectItem value={Likelihood.likely}>
-										{t("vendors.risks.likely")}
+									<SelectItem value={Likelihood.unlikely}>
+										{t("vendors.risks.unlikely")}
 									</SelectItem>
-									<SelectItem value={Likelihood.very_likely}>
-										{t("vendors.risks.very_likely")}
+									<SelectItem value={Likelihood.very_unlikely}>
+										{t("vendors.risks.very_unlikely")} (Bottom row)
 									</SelectItem>
 								</SelectContent>
 							</Select>
@@ -139,8 +160,14 @@ export function ResidualRiskForm({
 					name="residualImpact"
 					render={({ field }) => (
 						<FormItem>
-							<FormLabel>{t("vendors.risks.residual_impact")}</FormLabel>
-							<Select onValueChange={field.onChange} defaultValue={field.value}>
+							<FormLabel>
+								{t("vendors.risks.residual_impact")} (Horizontal Axis)
+							</FormLabel>
+							<Select
+								onValueChange={field.onChange}
+								defaultValue={field.value}
+								value={field.value}
+							>
 								<FormControl>
 									<SelectTrigger>
 										<SelectValue
@@ -150,7 +177,7 @@ export function ResidualRiskForm({
 								</FormControl>
 								<SelectContent>
 									<SelectItem value={Impact.insignificant}>
-										{t("vendors.risks.insignificant")}
+										{t("vendors.risks.insignificant")} (Left column)
 									</SelectItem>
 									<SelectItem value={Impact.minor}>
 										{t("vendors.risks.minor")}
@@ -162,7 +189,7 @@ export function ResidualRiskForm({
 										{t("vendors.risks.major")}
 									</SelectItem>
 									<SelectItem value={Impact.severe}>
-										{t("vendors.risks.severe")}
+										{t("vendors.risks.severe")} (Right column)
 									</SelectItem>
 								</SelectContent>
 							</Select>
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/page.tsx
index ca9f47b2de..03a3ec3edb 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/page.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/page.tsx
@@ -1,17 +1,9 @@
 "use server";
 
-import { DataTable } from "@/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/tasks/data-table/data-table";
-import {
-  NoResults,
-  NoTasks,
-} from "@/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/tasks/data-table/empty-states";
-import { FilterToolbar } from "@/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/tasks/data-table/filter-toolbar";
-import { Loading } from "@/components/frameworks/loading";
 import { getI18n } from "@/locales/server";
 import { auth } from "@comp/auth";
 import { db } from "@comp/db";
 import type { TaskStatus } from "@comp/db/types";
-import { Card, CardContent, CardHeader, CardTitle } from "@comp/ui/card";
 import type { Metadata } from "next";
 import { setStaticParamsLocale } from "next-international/server";
 import { headers } from "next/headers";
@@ -22,242 +14,246 @@ import { SecondaryFields } from "./components/secondary-fields/secondary-fields"
 import { TitleAndDescription } from "./components/title-and-description/title-and-description";
 
 interface PageProps {
-  searchParams: Promise<{
-    search?: string;
-    status?: string;
-    sort?: string;
-    page?: string;
-    per_page?: string;
-  }>;
-  params: Promise<{ vendorId: string; locale: string }>;
+	searchParams: Promise<{
+		search?: string;
+		status?: string;
+		sort?: string;
+		page?: string;
+		per_page?: string;
+	}>;
+	params: Promise<{ vendorId: string; locale: string }>;
 }
 
 export default async function VendorPage({ searchParams, params }: PageProps) {
-  const { vendorId } = await params;
-  const vendor = await getVendor(vendorId);
-  const users = await getUsers();
-  const t = await getI18n();
+	const { vendorId } = await params;
+	const vendor = await getVendor(vendorId);
+	const assignees = await getAssignees();
+	const t = await getI18n();
 
-  const {
-    search,
-    status,
-    sort,
-    page = "1",
-    per_page = "5",
-  } = await searchParams;
+	const {
+		search,
+		status,
+		sort,
+		page = "1",
+		per_page = "5",
+	} = await searchParams;
 
-  const [column, order] = sort?.split(":") ?? [];
-  const hasFilters = !!(search || status);
+	const [column, order] = sort?.split(":") ?? [];
+	const hasFilters = !!(search || status);
 
-  const { tasks: loadedTasks, total } = await getTasks({
-    vendorId,
-    search,
-    status: status as TaskStatus,
-    column,
-    order,
-    page: Number.parseInt(page),
-    per_page: Number.parseInt(per_page),
-  });
+	const { tasks: loadedTasks, total } = await getTasks({
+		vendorId,
+		search,
+		status: status as TaskStatus,
+		column,
+		order,
+		page: Number.parseInt(page),
+		per_page: Number.parseInt(per_page),
+	});
 
-  if (!vendor) {
-    redirect("/");
-  }
+	if (!vendor) {
+		redirect("/");
+	}
 
-  return (
-    <div className="flex flex-col gap-4">
-      <TitleAndDescription vendor={vendor} />
-      <SecondaryFields vendor={vendor} users={users} />
-      <Card>
-        <CardHeader>
-          <CardTitle>
-            <div className="flex items-center justify-between gap-2">
-              {t("vendors.tasks.title")}
-            </div>
-          </CardTitle>
-        </CardHeader>
-        <CardContent>
-          <div className="relative">
-            {loadedTasks.length > 0 ? (
-              <>
-                <FilterToolbar
-                  isEmpty={loadedTasks.length === 0}
-                  users={users}
-                />
-                <DataTable
-                  data={loadedTasks}
-                  pageCount={Math.ceil(total / Number.parseInt(per_page))}
-                  currentPage={Number.parseInt(page)}
-                />
-              </>
-            ) : hasFilters ? (
-              <NoResults hasFilters={hasFilters} />
-            ) : (
-              <>
-                <NoTasks isEmpty={true} />
-                <Loading isEmpty={true} amount={3} />
-              </>
-            )}
-          </div>
-        </CardContent>
-      </Card>
-      <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-        <InherentRiskVendorChart vendor={vendor} />
-        <ResidualRiskVendorChart vendor={vendor} />
-      </div>
-    </div>
-  );
+	return (
+		<div className="flex flex-col gap-4">
+			<TitleAndDescription vendor={vendor} />
+			<SecondaryFields vendor={vendor} assignees={assignees} />
+			{/* <Card>
+				<CardHeader>
+					<CardTitle>
+						<div className="flex items-center justify-between gap-2">
+							{t("vendors.tasks.title")}
+						</div>
+					</CardTitle>
+				</CardHeader>
+				<CardContent>
+					<div className="relative">
+						{loadedTasks.length > 0 ? (
+							<>
+								<FilterToolbar
+									isEmpty={loadedTasks.length === 0}
+									users={users}
+								/>
+								<DataTable
+									data={loadedTasks}
+									pageCount={Math.ceil(total / Number.parseInt(per_page))}
+									currentPage={Number.parseInt(page)}
+								/>
+							</>
+						) : hasFilters ? (
+							<NoResults hasFilters={hasFilters} />
+						) : (
+							<>
+								<NoTasks isEmpty={true} />
+								<Loading isEmpty={true} amount={3} />
+							</>
+						)}
+					</div>
+				</CardContent>
+			</Card> */}
+			<div className="grid grid-cols-1 gap-4">
+				<InherentRiskVendorChart vendor={vendor} />
+				<ResidualRiskVendorChart vendor={vendor} />
+			</div>
+		</div>
+	);
 }
 
 async function getVendor(vendorId: string) {
-  const session = await auth.api.getSession({
-    headers: await headers(),
-  });
+	const session = await auth.api.getSession({
+		headers: await headers(),
+	});
 
-  if (!session || !session.session.activeOrganizationId) {
-    return null;
-  }
+	if (!session || !session.session.activeOrganizationId) {
+		return null;
+	}
 
-  const vendor = await db.vendor.findUnique({
-    where: {
-      id: vendorId,
-      organizationId: session.session.activeOrganizationId,
-    },
-    include: {
-      owner: true,
-    },
-  });
+	const vendor = await db.vendor.findUnique({
+		where: {
+			id: vendorId,
+			organizationId: session.session.activeOrganizationId,
+		},
+		include: {
+			assignee: {
+				include: {
+					user: true,
+				},
+			},
+		},
+	});
 
-  return vendor;
+	return vendor;
 }
 
-async function getUsers() {
-  const session = await auth.api.getSession({
-    headers: await headers(),
-  });
+async function getAssignees() {
+	const session = await auth.api.getSession({
+		headers: await headers(),
+	});
 
-  if (!session || !session.session.activeOrganizationId) {
-    return [];
-  }
+	if (!session || !session.session.activeOrganizationId) {
+		return [];
+	}
 
-  const members = await db.member.findMany({
-    where: { organizationId: session.session.activeOrganizationId },
-    include: {
-      user: true,
-    },
-  });
+	const assignees = await db.member.findMany({
+		where: {
+			organizationId: session.session.activeOrganizationId,
+			role: {
+				notIn: ["employee"],
+			},
+		},
+		include: {
+			user: true,
+		},
+	});
 
-  return members.map((member) => member.user);
+	return assignees;
 }
 
 async function getTasks({
-  vendorId,
-  search,
-  status,
-  column,
-  order,
-  page = 1,
-  per_page = 10,
+	vendorId,
+	search,
+	status,
+	column,
+	order,
+	page = 1,
+	per_page = 10,
 }: {
-  vendorId: string;
-  search?: string;
-  status?: TaskStatus;
-  column?: string;
-  order?: string;
-  page?: number;
-  per_page?: number;
+	vendorId: string;
+	search?: string;
+	status?: TaskStatus;
+	column?: string;
+	order?: string;
+	page?: number;
+	per_page?: number;
 }) {
-  const session = await auth.api.getSession({
-    headers: await headers(),
-  });
+	const session = await auth.api.getSession({
+		headers: await headers(),
+	});
 
-  if (!session || !session.session.activeOrganizationId) {
-    return { tasks: [], total: 0 };
-  }
+	if (!session || !session.session.activeOrganizationId) {
+		return { tasks: [], total: 0 };
+	}
 
-  const skip = (page - 1) * per_page;
+	const skip = (page - 1) * per_page;
 
-  const [tasks, total] = await Promise.all([
-    db.task
-      .findMany({
-        where: {
-          relatedId: vendorId,
-          AND: [
-            search
-              ? {
-                OR: [
-                  { title: { contains: search, mode: "insensitive" } },
-                  {
-                    description: { contains: search, mode: "insensitive" },
-                  },
-                ],
-              }
-              : {},
-            status ? { status } : {},
-          ],
-        },
-        orderBy: column
-          ? {
-            [column]: order === "asc" ? "asc" : "desc",
-          }
-          : {
-            createdAt: "desc",
-          },
-        skip,
-        take: per_page,
-        include: {
-          assignee: {
-            select: {
-              user: {
-                select: {
-                  name: true,
-                  image: true,
-                },
-              },
-            },
-          },
-        },
-      })
-      .then((tasks) =>
-        tasks.map((task) => ({
-          ...task,
-          dueDate: task.dueDate ?? new Date(),
-          assignee: {
-            name: task.assignee?.user?.name ?? "",
-            image: task.assignee?.user?.image ?? "",
-          },
-        })),
-      ),
-    db.task.count({
-      where: {
-        relatedId: vendorId,
-        AND: [
-          search
-            ? {
-              OR: [
-                { title: { contains: search, mode: "insensitive" } },
-                { description: { contains: search, mode: "insensitive" } },
-              ],
-            }
-            : {},
-          status ? { status } : {},
-        ],
-      },
-    }),
-  ]);
+	const [tasks, total] = await Promise.all([
+		db.task
+			.findMany({
+				where: {
+					relatedId: vendorId,
+					AND: [
+						search
+							? {
+									OR: [
+										{ title: { contains: search, mode: "insensitive" } },
+										{
+											description: { contains: search, mode: "insensitive" },
+										},
+									],
+								}
+							: {},
+						status ? { status } : {},
+					],
+				},
+				orderBy: column
+					? {
+							[column]: order === "asc" ? "asc" : "desc",
+						}
+					: {
+							createdAt: "desc",
+						},
+				skip,
+				take: per_page,
+				include: {
+					assignee: {
+						include: {
+							user: true,
+						},
+					},
+				},
+			})
+			.then((tasks) =>
+				tasks.map((task) => ({
+					...task,
+					dueDate: task.dueDate ?? new Date(),
+					assignee: {
+						name: task.assignee?.user.name ?? "",
+						image: task.assignee?.user.image ?? "",
+					},
+				})),
+			),
+		db.task.count({
+			where: {
+				relatedId: vendorId,
+				AND: [
+					search
+						? {
+								OR: [
+									{ title: { contains: search, mode: "insensitive" } },
+									{ description: { contains: search, mode: "insensitive" } },
+								],
+							}
+						: {},
+					status ? { status } : {},
+				],
+			},
+		}),
+	]);
 
-  return { tasks, total };
+	return { tasks, total };
 }
 
 export async function generateMetadata({
-  params,
+	params,
 }: {
-  params: Promise<{ locale: string }>;
+	params: Promise<{ locale: string }>;
 }): Promise<Metadata> {
-  const { locale } = await params;
-  setStaticParamsLocale(locale);
-  const t = await getI18n();
+	const { locale } = await params;
+	setStaticParamsLocale(locale);
+	const t = await getI18n();
 
-  return {
-    title: t("sidebar.vendors"),
-  };
+	return {
+		title: t("sidebar.vendors"),
+	};
 }
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/tasks/[taskId]/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/tasks/[taskId]/page.tsx
index e2a2b5327d..069c7cef60 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/tasks/[taskId]/page.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/tasks/[taskId]/page.tsx
@@ -53,6 +53,9 @@ export default async function TaskPage({ params }: PageProps) {
 		const assignees = await db.member.findMany({
 			where: {
 				organizationId: orgId,
+				role: {
+					notIn: ["employee"],
+				},
 			},
 			include: {
 				user: true,
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/actions/create-vendor-action.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/actions/create-vendor-action.ts
index ef6520ffdd..11223d602b 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/actions/create-vendor-action.ts
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/actions/create-vendor-action.ts
@@ -10,45 +10,45 @@ import { db } from "@comp/db";
 import { headers } from "next/headers";
 
 const schema = z.object({
-	name: z.string().min(1, "Name is required"),
-	website: z.string().url("Must be a valid URL").optional(),
-	description: z.string().optional(),
-	category: z.nativeEnum(VendorCategory),
-	status: z.nativeEnum(VendorStatus).default(VendorStatus.not_assessed),
-	ownerId: z.string().optional(),
+  name: z.string().min(1, "Name is required"),
+  website: z.string().url("Must be a valid URL").optional(),
+  description: z.string().optional(),
+  category: z.nativeEnum(VendorCategory),
+  status: z.nativeEnum(VendorStatus).default(VendorStatus.not_assessed),
+  assigneeId: z.string().optional(),
 });
 
 export const createVendorAction = createSafeActionClient()
-	.schema(schema)
-	.action(async (input): Promise<ActionResponse<Vendor>> => {
-		try {
-			const session = await auth.api.getSession({
-				headers: await headers(),
-			});
+  .schema(schema)
+  .action(async (input): Promise<ActionResponse<Vendor>> => {
+    try {
+      const session = await auth.api.getSession({
+        headers: await headers(),
+      });
 
-			if (!session?.session?.activeOrganizationId) {
-				throw new Error("Unauthorized");
-			}
+      if (!session?.session?.activeOrganizationId) {
+        throw new Error("Unauthorized");
+      }
 
-			const vendor = await db.vendor.create({
-				data: {
-					name: input.parsedInput.name,
-					description: input.parsedInput.description || "",
-					category: input.parsedInput.category,
-					status: input.parsedInput.status,
-					ownerId: input.parsedInput.ownerId,
-					organizationId: session.session.activeOrganizationId,
-				},
-			});
+      const vendor = await db.vendor.create({
+        data: {
+          name: input.parsedInput.name,
+          description: input.parsedInput.description || "",
+          category: input.parsedInput.category,
+          status: input.parsedInput.status,
+          assigneeId: input.parsedInput.assigneeId,
+          organizationId: session.session.activeOrganizationId,
+        },
+      });
 
-			revalidatePath(`/${session.session.activeOrganizationId}/vendors`);
+      revalidatePath(`/${session.session.activeOrganizationId}/vendors`);
 
-			return { success: true, data: vendor };
-		} catch (error) {
-			return {
-				success: false,
-				error:
-					error instanceof Error ? error.message : "Failed to create vendor",
-			};
-		}
-	});
+      return { success: true, data: vendor };
+    } catch (error) {
+      return {
+        success: false,
+        error:
+          error instanceof Error ? error.message : "Failed to create vendor",
+      };
+    }
+  });
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/create-vendor-form.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/create-vendor-form.tsx
index 1d56205602..e9d4814a10 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/create-vendor-form.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/create-vendor-form.tsx
@@ -1,9 +1,8 @@
 "use client";
 
-import { useOrganizationAdmins } from "@/app/[locale]/(app)/(dashboard)/[orgId]/hooks/useOrganizationAdmins";
-import { SelectUser } from "@/components/select-user";
 import { useI18n } from "@/locales/client";
-import { VendorCategory, VendorStatus } from "@comp/db/types";
+import { Member, useSession } from "@comp/auth";
+import { User, VendorCategory, VendorStatus } from "@comp/db/types";
 import {
 	Accordion,
 	AccordionContent,
@@ -30,13 +29,13 @@ import {
 import { Textarea } from "@comp/ui/textarea";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { ArrowRightIcon } from "lucide-react";
-import { useSession } from "@comp/auth";
 import { useAction } from "next-safe-action/hooks";
 import { useRouter } from "next/navigation";
 import { useQueryState } from "nuqs";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
+import { SelectAssignee } from "../../components/SelectAssignee";
 import { createVendorAction } from "../actions/create-vendor-action";
 
 const createVendorSchema = z.object({
@@ -45,10 +44,14 @@ const createVendorSchema = z.object({
 	description: z.string().optional(),
 	category: z.nativeEnum(VendorCategory),
 	status: z.nativeEnum(VendorStatus).default(VendorStatus.not_assessed),
-	ownerId: z.string().optional(),
+	assigneeId: z.string().optional(),
 });
 
-export function CreateVendorForm() {
+export function CreateVendorForm({
+	assignees,
+}: {
+	assignees: (Member & { user: User })[];
+}) {
 	const t = useI18n();
 	const session = useSession();
 
@@ -77,8 +80,6 @@ export function CreateVendorForm() {
 
 	const router = useRouter();
 
-	const { data: admins, isLoading: isLoadingAdmins } = useOrganizationAdmins();
-
 	const createVendor = useAction(createVendorAction, {
 		onSuccess: async (data) => {
 			const organizationId = session.data?.session.activeOrganizationId;
@@ -284,29 +285,17 @@ export function CreateVendorForm() {
 										/>
 										<FormField
 											control={form.control}
-											name="ownerId"
+											name="assigneeId"
 											render={({ field }) => (
 												<FormItem>
 													<FormLabel>{t("common.assignee.label")}</FormLabel>
 													<FormControl>
-														<Select
-															value={field.value}
-															onValueChange={field.onChange}
-														>
-															<SelectTrigger>
-																<SelectValue
-																	placeholder={t("common.assignee.placeholder")}
-																/>
-															</SelectTrigger>
-															<SelectContent>
-																<SelectUser
-																	users={admins || []}
-																	isLoading={isLoadingAdmins}
-																	onSelect={field.onChange}
-																	selectedId={field.value}
-																/>
-															</SelectContent>
-														</Select>
+														<SelectAssignee
+															assignees={assignees}
+															assigneeId={field.value}
+															withTitle={false}
+															onAssigneeChange={field.onChange}
+														/>
 													</FormControl>
 													<FormMessage />
 												</FormItem>
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/create-vendor-sheet.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/create-vendor-sheet.tsx
index e18cc21c0c..8ae6f08b85 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/create-vendor-sheet.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/create-vendor-sheet.tsx
@@ -9,8 +9,13 @@ import { Sheet, SheetContent, SheetHeader, SheetTitle } from "@comp/ui/sheet";
 import { X } from "lucide-react";
 import { useQueryState } from "nuqs";
 import { CreateVendorForm } from "./create-vendor-form";
+import { Member, User } from "@comp/db/types";
 
-export function CreateVendorSheet() {
+export function CreateVendorSheet({
+	assignees,
+}: {
+	assignees: (Member & { user: User })[];
+}) {
 	const t = useI18n();
 	const isDesktop = useMediaQuery("(min-width: 768px)");
 	const [open, setOpen] = useQueryState("createVendorSheet");
@@ -37,7 +42,7 @@ export function CreateVendorSheet() {
 					</SheetHeader>
 
 					<ScrollArea className="h-full p-0 pb-[100px]" hideScrollbar>
-						<CreateVendorForm />
+						<CreateVendorForm assignees={assignees} />
 					</ScrollArea>
 				</SheetContent>
 			</Sheet>
@@ -48,7 +53,7 @@ export function CreateVendorSheet() {
 		<Drawer open={isOpen} onOpenChange={handleOpenChange}>
 			<DrawerTitle hidden>{t("vendors.create")}</DrawerTitle>
 			<DrawerContent className="p-6">
-				<CreateVendorForm />
+				<CreateVendorForm assignees={assignees} />
 			</DrawerContent>
 		</Drawer>
 	);
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/components/VendorRegisterColumns.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/components/VendorRegisterColumns.tsx
index e099164065..14f6277aa8 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/components/VendorRegisterColumns.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/components/VendorRegisterColumns.tsx
@@ -4,6 +4,7 @@ import { Badge } from "@comp/ui/badge";
 import type { ColumnDef } from "@tanstack/react-table";
 import Link from "next/link";
 import type { VendorRegisterTableRow } from "./VendorRegisterTable";
+import { UserIcon } from "lucide-react";
 
 export const columns: ColumnDef<VendorRegisterTableRow>[] = [
 	{
@@ -41,18 +42,32 @@ export const columns: ColumnDef<VendorRegisterTableRow>[] = [
 		header: "Assignee",
 		accessorKey: "assignee",
 		cell: ({ row }) => {
+			// Handle null assignee
+			if (!row.original.assignee) {
+				return (
+					<div className="flex items-center gap-2">
+						<div className="flex items-center justify-center h-8 w-8 rounded-full bg-muted">
+							<UserIcon className="h-4 w-4 text-muted-foreground" />
+						</div>
+						<p className="text-sm font-medium text-muted-foreground">None</p>
+					</div>
+				);
+			}
+
 			return (
 				<div className="flex items-center gap-2">
 					<Avatar className="h-8 w-8">
 						<AvatarImage
-							src={row.original.owner?.image || undefined}
-							alt={row.original.owner?.name || ""}
+							src={row.original.assignee.user.image || undefined}
+							alt={row.original.assignee.user.name || ""}
 						/>
 						<AvatarFallback>
-							{row.original.owner?.name?.charAt(0) || "?"}
+							{row.original.assignee.user.name?.charAt(0) || "?"}
 						</AvatarFallback>
 					</Avatar>
-					<p className="text-sm font-medium">{row.original.owner?.name}</p>
+					<p className="text-sm font-medium">
+						{row.original.assignee.user.name}
+					</p>
 				</div>
 			);
 		},
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/components/VendorRegisterTable.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/components/VendorRegisterTable.tsx
index e2681eafa7..7741d3ba34 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/components/VendorRegisterTable.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/components/VendorRegisterTable.tsx
@@ -2,19 +2,26 @@
 
 import { DataTable } from "@/components/ui/data-table";
 import { useI18n } from "@/locales/client";
-import type { Departments, RiskStatus, User, Vendor } from "@comp/db/types";
+import type { Member, User, Vendor } from "@comp/db/types";
 import { Plus } from "lucide-react";
 import { useQueryState } from "nuqs";
 import { useState } from "react";
-import { useOrganizationAdmins } from "@/app/[locale]/(app)/(dashboard)/[orgId]/hooks/useOrganizationAdmins";
 import { CreateVendorSheet } from "../../components/create-vendor-sheet";
 import { columns } from "./VendorRegisterColumns";
 
-export type VendorRegisterTableRow = Vendor & { owner: User | null };
+export type VendorRegisterTableRow = Vendor & {
+	assignee: {
+		user: User;
+	} | null;
+};
 
 export const VendorRegisterTable = ({
 	data,
-}: { data: VendorRegisterTableRow[] }) => {
+	assignees,
+}: {
+	data: VendorRegisterTableRow[];
+	assignees: (Member & { user: User })[];
+}) => {
 	const t = useI18n();
 	// State
 	const [search, setSearch] = useState("");
@@ -28,64 +35,12 @@ export const VendorRegisterTable = ({
 		defaultValue: 10,
 		parse: Number,
 	});
-	const [status, setStatus] = useQueryState<RiskStatus | null>("status", {
-		defaultValue: null,
-		parse: (value) => value as RiskStatus | null,
-	});
-	const [department, setDepartment] = useQueryState<Departments | null>(
-		"department",
-		{
-			defaultValue: null,
-			parse: (value) => value as Departments | null,
-		},
-	);
-	const [assigneeId, setAssigneeId] = useQueryState<string | null>(
-		"assigneeId",
-		{
-			defaultValue: null,
-			parse: (value) => value,
-		},
-	);
-
-	const hasActiveFilters = Boolean(status || department || assigneeId);
-
-	const handleClearFilters = () => {
-		setStatus(null);
-		setDepartment(null);
-		setAssigneeId(null);
-		setPage(1);
-	};
-
-	const departments: Departments[] = [
-		"none",
-		"it",
-		"hr",
-		"admin",
-		"gov",
-		"itsm",
-		"qms",
-	] as const;
-
-	const { data: admins } = useOrganizationAdmins();
-
-	// const filterCategories = VendorRegisterFilters({
-	// 	setPage: (newPage: number) => setPage(newPage),
-	// 	departments: departments,
-	// 	assignees: admins || [],
-	// 	status,
-	// 	setStatus,
-	// 	department,
-	// 	setDepartment,
-	// 	assigneeId,
-	// 	setAssigneeId,
-	// });
 
 	return (
 		<>
-			<DataTable<VendorRegisterTableRow>
+			<DataTable
 				columns={columns}
 				data={data}
-				// isLoading={isLoading}
 				search={{
 					value: search,
 					onChange: setSearch,
@@ -100,20 +55,13 @@ export const VendorRegisterTable = ({
 				}}
 				onPageChange={(newPage) => setPage(newPage)}
 				onPageSizeChange={(newPageSize) => setPageSize(newPageSize)}
-				// filters={{
-				// 	categories: filterCategories,
-				// 	hasActiveFilters,
-				// 	onClearFilters: handleClearFilters,
-				// 	activeFilterCount: [status, department, assigneeId].filter(Boolean)
-				// 		.length,
-				// }}
 				ctaButton={{
 					label: t("vendors.register.create_new"),
 					onClick: () => setOpen("true"),
 					icon: <Plus className="h-4 w-4 mr-2" />,
 				}}
 			/>
-			<CreateVendorSheet />
+			<CreateVendorSheet assignees={assignees} />
 		</>
 	);
 };
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/page.tsx
index f9ca547393..4af3020c36 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/page.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/register/page.tsx
@@ -8,6 +8,8 @@ import { VendorRegisterTable } from "./components/VendorRegisterTable";
 import { Departments, VendorStatus } from "@comp/db/types";
 import { z } from "zod";
 import { headers } from "next/headers";
+import { getServersideSession } from "@/lib/get-session";
+import { cache } from "react";
 
 export default async function Page({
 	searchParams,
@@ -53,16 +55,22 @@ export default async function Page({
 			organizationId: session.session.activeOrganizationId,
 			...(status && { status: status }),
 			...(department && { department: department }),
-			...(assigneeId && { ownerId: assigneeId }),
+			...(assigneeId && { assigneeId: assigneeId }),
 		},
 		include: {
-			owner: true,
+			assignee: {
+				select: {
+					user: true,
+				},
+			},
 		},
 		skip: page ? (Number(page) - 1) * Number(pageSize || 10) : 0,
 		take: Number(pageSize || 10),
 	});
 
-	return <VendorRegisterTable data={vendors} />;
+	const assignees = await getAssignees();
+
+	return <VendorRegisterTable assignees={assignees} data={vendors} />;
 }
 
 export async function generateMetadata({
@@ -78,3 +86,29 @@ export async function generateMetadata({
 		title: t("vendors.register.title"),
 	};
 }
+
+const getAssignees = cache(async () => {
+	const {
+		session: { activeOrganizationId },
+	} = await getServersideSession({
+		headers: await headers(),
+	});
+
+	if (!activeOrganizationId) {
+		return [];
+	}
+
+	const assignees = await db.member.findMany({
+		where: {
+			organizationId: activeOrganizationId,
+			role: {
+				notIn: ["employee"],
+			},
+		},
+		include: {
+			user: true,
+		},
+	});
+
+	return assignees;
+});
diff --git a/apps/app/src/app/api/v1/risks/[id]/route.ts b/apps/app/src/app/api/v1/risks/[id]/route.ts
index c144d03917..4a85c8e349 100644
--- a/apps/app/src/app/api/v1/risks/[id]/route.ts
+++ b/apps/app/src/app/api/v1/risks/[id]/route.ts
@@ -2,12 +2,12 @@ import { db } from "@comp/db";
 import { NextResponse, type NextRequest } from "next/server";
 import { getOrganizationFromApiKey } from "@/lib/api-key";
 import type {
-	RiskTreatmentType,
-	RiskStatus,
-	RiskCategory,
-	Departments,
-	Likelihood,
-	Impact,
+  RiskTreatmentType,
+  RiskStatus,
+  RiskCategory,
+  Departments,
+  Likelihood,
+  Impact,
 } from "@comp/db/types";
 
 // Configure this route to use Node.js runtime instead of Edge
@@ -31,116 +31,127 @@ export const runtime = "nodejs";
  * - 500: { success: false, error: "Failed to fetch risk" }
  */
 export async function GET(
-	request: NextRequest,
-	{ params }: { params: Promise<{ id: string }> },
+  request: NextRequest,
+  { params }: { params: Promise<{ id: string }> }
 ) {
-	// Get the organization ID from the API key
-	const { organizationId, errorResponse } =
-		await getOrganizationFromApiKey(request);
-
-	// If there's an error response, return it
-	if (errorResponse) {
-		return errorResponse;
-	}
-
-	try {
-		const riskId = (await params).id;
-
-		// Fetch the risk
-		const risk = await db.risk.findFirst({
-			where: {
-				id: riskId,
-				organizationId: organizationId!,
-			},
-			select: {
-				id: true,
-				title: true,
-				description: true,
-				category: true,
-				department: true,
-				status: true,
-				likelihood: true,
-				impact: true,
-				residualLikelihood: true,
-				residualImpact: true,
-				createdAt: true,
-				updatedAt: true,
-				assigneeId: true,
-				treatmentStrategy: true,
-				treatmentStrategyDescription: true,
-				assignee: {
-					select: {
-						id: true,
-						user: {
-							select: {
-								name: true,
-							},
-						},
-					},
-				},
-			},
-		});
-
-		// If risk not found, return 404
-		if (!risk) {
-			return NextResponse.json(
-				{
-					success: false,
-					error: "Risk not found",
-				},
-				{ status: 404 },
-			);
-		}
-
-		// Fetch tasks for this risk
-		const tasks = await db.task.findMany({
-			where: {
-				relatedId: riskId,
-				relatedType: "risk",
-				organizationId: organizationId!,
-			},
-			select: {
-				id: true,
-				title: true,
-				description: true,
-				status: true,
-				dueDate: true,
-				createdAt: true,
-				updatedAt: true,
-				assigneeId: true,
-			},
-			orderBy: {
-				createdAt: "desc",
-			},
-		});
-
-		// Format dates for JSON response
-		const formattedRisk = {
-			...risk,
-			createdAt: risk.createdAt.toISOString(),
-			updatedAt: risk.updatedAt.toISOString(),
-			tasks: tasks.map((task) => ({
-				...task,
-				createdAt: task.createdAt.toISOString(),
-				updatedAt: task.updatedAt.toISOString(),
-				dueDate: task.dueDate.toISOString(),
-			})),
-		};
-
-		return NextResponse.json({
-			success: true,
-			data: formattedRisk,
-		});
-	} catch (error) {
-		console.error("Error fetching risk:", error);
-		return NextResponse.json(
-			{
-				success: false,
-				error: "Failed to fetch risk",
-			},
-			{ status: 500 },
-		);
-	}
+  // Get the organization ID from the API key
+  const { organizationId, errorResponse } =
+    await getOrganizationFromApiKey(request);
+
+  // If there's an error response, return it
+  if (errorResponse) {
+    return errorResponse;
+  }
+
+  try {
+    const riskId = (await params).id;
+
+    // Fetch the risk
+    const risk = await db.risk.findFirst({
+      where: {
+        id: riskId,
+        organizationId: organizationId!,
+      },
+      select: {
+        id: true,
+        title: true,
+        description: true,
+        category: true,
+        department: true,
+        status: true,
+        likelihood: true,
+        impact: true,
+        residualLikelihood: true,
+        residualImpact: true,
+        createdAt: true,
+        updatedAt: true,
+        assigneeId: true,
+        treatmentStrategy: true,
+        treatmentStrategyDescription: true,
+        assignee: {
+          select: {
+            id: true,
+            user: {
+              select: {
+                name: true,
+                email: true,
+              },
+            },
+          },
+        },
+      },
+    });
+
+    // If risk not found, return 404
+    if (!risk) {
+      return NextResponse.json(
+        {
+          success: false,
+          error: "Risk not found",
+        },
+        { status: 404 }
+      );
+    }
+
+    // Fetch tasks for this risk
+    const tasks = await db.task.findMany({
+      where: {
+        relatedId: riskId,
+        relatedType: "risk",
+        organizationId: organizationId!,
+      },
+      select: {
+        id: true,
+        title: true,
+        description: true,
+        status: true,
+        dueDate: true,
+        createdAt: true,
+        updatedAt: true,
+        assigneeId: true,
+        assignee: {
+          select: {
+            user: {
+              select: {
+                name: true,
+                email: true,
+              },
+            },
+          },
+        },
+      },
+      orderBy: {
+        createdAt: "desc",
+      },
+    });
+
+    // Format dates for JSON response
+    const formattedRisk = {
+      ...risk,
+      createdAt: risk.createdAt.toISOString(),
+      updatedAt: risk.updatedAt.toISOString(),
+      tasks: tasks.map((task) => ({
+        ...task,
+        createdAt: task.createdAt.toISOString(),
+        updatedAt: task.updatedAt.toISOString(),
+        dueDate: task.dueDate.toISOString(),
+      })),
+    };
+
+    return NextResponse.json({
+      success: true,
+      data: formattedRisk,
+    });
+  } catch (error) {
+    console.error("Error fetching risk:", error);
+    return NextResponse.json(
+      {
+        success: false,
+        error: "Failed to fetch risk",
+      },
+      { status: 500 }
+    );
+  }
 }
 
 /**
@@ -161,60 +172,60 @@ export async function GET(
  * - 500: { success: false, error: string }
  */
 export async function DELETE(
-	request: NextRequest,
-	{ params }: { params: Promise<{ id: string }> },
+  request: NextRequest,
+  { params }: { params: Promise<{ id: string }> }
 ) {
-	// Get the organization ID from the API key
-	const { organizationId, errorResponse } =
-		await getOrganizationFromApiKey(request);
-
-	// If there's an error response, return it
-	if (errorResponse) {
-		return errorResponse;
-	}
-
-	try {
-		const riskId = (await params).id;
-
-		// Check if the risk exists and belongs to the organization
-		const existingRisk = await db.risk.findFirst({
-			where: {
-				id: riskId,
-				organizationId: organizationId!,
-			},
-		});
-
-		if (!existingRisk) {
-			return NextResponse.json(
-				{
-					success: false,
-					error: "Risk not found",
-				},
-				{ status: 404 },
-			);
-		}
-
-		// Delete the risk
-		await db.risk.delete({
-			where: {
-				id: riskId,
-			},
-		});
-
-		return NextResponse.json({
-			success: true,
-			data: {
-				message: "Risk deleted successfully",
-			},
-		});
-	} catch (error) {
-		console.error("Error deleting risk:", error);
-		return NextResponse.json(
-			{
-				success: false,
-				error: "Failed to delete risk",
-			},
-			{ status: 500 },
-		);
-	}
+  // Get the organization ID from the API key
+  const { organizationId, errorResponse } =
+    await getOrganizationFromApiKey(request);
+
+  // If there's an error response, return it
+  if (errorResponse) {
+    return errorResponse;
+  }
+
+  try {
+    const riskId = (await params).id;
+
+    // Check if the risk exists and belongs to the organization
+    const existingRisk = await db.risk.findFirst({
+      where: {
+        id: riskId,
+        organizationId: organizationId!,
+      },
+    });
+
+    if (!existingRisk) {
+      return NextResponse.json(
+        {
+          success: false,
+          error: "Risk not found",
+        },
+        { status: 404 }
+      );
+    }
+
+    // Delete the risk
+    await db.risk.delete({
+      where: {
+        id: riskId,
+      },
+    });
+
+    return NextResponse.json({
+      success: true,
+      data: {
+        message: "Risk deleted successfully",
+      },
+    });
+  } catch (error) {
+    console.error("Error deleting risk:", error);
+    return NextResponse.json(
+      {
+        success: false,
+        error: "Failed to delete risk",
+      },
+      { status: 500 }
+    );
+  }
 }
diff --git a/apps/app/src/app/api/v1/risks/route.ts b/apps/app/src/app/api/v1/risks/route.ts
index 700deacd55..2b4eb99fc4 100644
--- a/apps/app/src/app/api/v1/risks/route.ts
+++ b/apps/app/src/app/api/v1/risks/route.ts
@@ -1,10 +1,10 @@
 import { db } from "@comp/db";
 import {
-	Departments,
-	RiskCategory,
-	RiskStatus,
-	Likelihood,
-	Impact,
+  Departments,
+  RiskCategory,
+  RiskStatus,
+  Likelihood,
+  Impact,
 } from "@comp/db/types";
 import { NextResponse, type NextRequest } from "next/server";
 import { getOrganizationFromApiKey } from "@/lib/api-key";
@@ -15,30 +15,30 @@ export const runtime = "nodejs";
 
 // Define the schema for query parameters
 const queryParamsSchema = z.object({
-	status: z.nativeEnum(RiskStatus).optional(),
-	category: z.nativeEnum(RiskCategory).optional(),
-	department: z.nativeEnum(Departments).optional(),
-	search: z.string().optional(),
+  status: z.nativeEnum(RiskStatus).optional(),
+  category: z.nativeEnum(RiskCategory).optional(),
+  department: z.nativeEnum(Departments).optional(),
+  search: z.string().optional(),
 });
 
 // Define the schema for risk creation
 const riskCreateSchema = z.object({
-	title: z.string().min(1, { message: "Title is required" }),
-	description: z.string().min(1, { message: "Description is required" }),
-	category: z.nativeEnum(RiskCategory),
-	department: z.nativeEnum(Departments).optional(),
-	status: z.nativeEnum(RiskStatus).optional().default(RiskStatus.open),
-	likelihood: z
-		.nativeEnum(Likelihood)
-		.optional()
-		.default(Likelihood.very_unlikely),
-	impact: z.nativeEnum(Impact).optional().default(Impact.insignificant),
-	residualLikelihood: z
-		.nativeEnum(Likelihood)
-		.optional()
-		.default(Likelihood.very_unlikely),
-	residualImpact: z.nativeEnum(Impact).optional().default(Impact.insignificant),
-	ownerId: z.string().optional().nullable(),
+  title: z.string().min(1, { message: "Title is required" }),
+  description: z.string().min(1, { message: "Description is required" }),
+  category: z.nativeEnum(RiskCategory),
+  department: z.nativeEnum(Departments).optional(),
+  status: z.nativeEnum(RiskStatus).optional().default(RiskStatus.open),
+  likelihood: z
+    .nativeEnum(Likelihood)
+    .optional()
+    .default(Likelihood.very_unlikely),
+  impact: z.nativeEnum(Impact).optional().default(Impact.insignificant),
+  residualLikelihood: z
+    .nativeEnum(Likelihood)
+    .optional()
+    .default(Likelihood.very_unlikely),
+  residualImpact: z.nativeEnum(Impact).optional().default(Impact.insignificant),
+  assigneeId: z.string().optional().nullable(),
 });
 
 // Type for the validated risk creation data
@@ -65,130 +65,131 @@ type RiskCreateInput = z.infer<typeof riskCreateSchema>;
  * - 500: { error: "Failed to fetch risks" }
  */
 export async function GET(request: NextRequest) {
-	// Get the organization ID from the API key
-	const { organizationId, errorResponse } =
-		await getOrganizationFromApiKey(request);
+  // Get the organization ID from the API key
+  const { organizationId, errorResponse } =
+    await getOrganizationFromApiKey(request);
 
-	// If there's an error response, return it
-	if (errorResponse) {
-		return errorResponse;
-	}
+  // If there's an error response, return it
+  if (errorResponse) {
+    return errorResponse;
+  }
 
-	try {
-		// Get query parameters
-		const searchParams = request.nextUrl.searchParams;
+  try {
+    // Get query parameters
+    const searchParams = request.nextUrl.searchParams;
 
-		// Create an object from the search params
-		const queryParamsObj = {
-			status: searchParams.get("status") || undefined,
-			category: searchParams.get("category") || undefined,
-			department: searchParams.get("department") || undefined,
-			search: searchParams.get("search") || undefined,
-		};
+    // Create an object from the search params
+    const queryParamsObj = {
+      status: searchParams.get("status") || undefined,
+      category: searchParams.get("category") || undefined,
+      department: searchParams.get("department") || undefined,
+      search: searchParams.get("search") || undefined,
+    };
 
-		// Validate query parameters
-		const validationResult = queryParamsSchema.safeParse(queryParamsObj);
+    // Validate query parameters
+    const validationResult = queryParamsSchema.safeParse(queryParamsObj);
 
-		if (!validationResult.success) {
-			return NextResponse.json(
-				{
-					success: false,
-					error: "Validation failed",
-					details: validationResult.error.format(),
-				},
-				{ status: 400 },
-			);
-		}
+    if (!validationResult.success) {
+      return NextResponse.json(
+        {
+          success: false,
+          error: "Validation failed",
+          details: validationResult.error.format(),
+        },
+        { status: 400 }
+      );
+    }
 
-		// Extract validated query parameters
-		const { status, category, department, search } = validationResult.data;
+    // Extract validated query parameters
+    const { status, category, department, search } = validationResult.data;
 
-		// Build the where clause
-		const where: any = {
-			organizationId: organizationId!,
-		};
+    // Build the where clause
+    const where: any = {
+      organizationId: organizationId!,
+    };
 
-		// Add status filter if provided
-		if (status) {
-			where.status = status;
-		}
+    // Add status filter if provided
+    if (status) {
+      where.status = status;
+    }
 
-		// Add category filter if provided
-		if (category) {
-			where.category = category;
-		}
+    // Add category filter if provided
+    if (category) {
+      where.category = category;
+    }
 
-		// Add department filter if provided
-		if (department) {
-			where.department = department;
-		}
+    // Add department filter if provided
+    if (department) {
+      where.department = department;
+    }
 
-		// Add search filter if provided
-		if (search) {
-			where.OR = [
-				{
-					title: {
-						contains: search,
-						mode: "insensitive",
-					},
-				},
-				{
-					description: {
-						contains: search,
-						mode: "insensitive",
-					},
-				},
-			];
-		}
+    // Add search filter if provided
+    if (search) {
+      where.OR = [
+        {
+          title: {
+            contains: search,
+            mode: "insensitive",
+          },
+        },
+        {
+          description: {
+            contains: search,
+            mode: "insensitive",
+          },
+        },
+      ];
+    }
 
-		// Fetch risks
-		const risks = await db.risk.findMany({
-			where,
-			select: {
-				id: true,
-				title: true,
-				description: true,
-				category: true,
-				department: true,
-				status: true,
-				likelihood: true,
-				impact: true,
-				residualLikelihood: true,
-				residualImpact: true,
-				createdAt: true,
-				updatedAt: true,
-				assigneeId: true,
-				assignee: {
-					select: {
-						id: true,
-						user: {
-							select: {
-								name: true,
-							},
-						},
-					},
-				},
-			},
-			orderBy: {
-				updatedAt: "desc",
-			},
-		});
+    // Fetch risks
+    const risks = await db.risk.findMany({
+      where,
+      select: {
+        id: true,
+        title: true,
+        description: true,
+        category: true,
+        department: true,
+        status: true,
+        likelihood: true,
+        impact: true,
+        residualLikelihood: true,
+        residualImpact: true,
+        createdAt: true,
+        updatedAt: true,
+        assigneeId: true,
+        assignee: {
+          select: {
+            id: true,
+            user: {
+              select: {
+                name: true,
+                email: true,
+              },
+            },
+          },
+        },
+      },
+      orderBy: {
+        updatedAt: "desc",
+      },
+    });
 
-		// Format dates for JSON response
-		const formattedRisks = risks.map((risk) => ({
-			...risk,
-			createdAt: risk.createdAt.toISOString(),
-			updatedAt: risk.updatedAt.toISOString(),
-		}));
+    // Format dates for JSON response
+    const formattedRisks = risks.map((risk) => ({
+      ...risk,
+      createdAt: risk.createdAt.toISOString(),
+      updatedAt: risk.updatedAt.toISOString(),
+    }));
 
-		return NextResponse.json({ success: true, data: formattedRisks });
-	} catch (error) {
-		console.error("Error fetching risks:", error);
-		return NextResponse.json(
-			{ success: false, error: "Failed to fetch risks" },
-			{ status: 500 },
-		);
-	}
+    return NextResponse.json({ success: true, data: formattedRisks });
+  } catch (error) {
+    console.error("Error fetching risks:", error);
+    return NextResponse.json(
+      { success: false, error: "Failed to fetch risks" },
+      { status: 500 }
+    );
+  }
 }
 
 /**
@@ -209,7 +210,7 @@ export async function GET(request: NextRequest) {
  * - impact: Impact - The impact score (optional, defaults to "insignificant")
  * - residualLikelihood: Likelihood - The residual likelihood score (optional, defaults to "very_unlikely")
  * - residualImpact: Impact - The residual impact score (optional, defaults to "insignificant")
- * - ownerId: string - The ID of the user who owns the risk (optional)
+ * - assigneeId: string - The ID of the user who owns the risk (optional)
  *
  * Returns:
  * - 200: { success: true, data: Risk }
@@ -218,63 +219,63 @@ export async function GET(request: NextRequest) {
  * - 500: { success: false, error: "Failed to create risk" }
  */
 export async function POST(request: NextRequest) {
-	// Get the organization ID from the API key
-	const { organizationId, errorResponse } =
-		await getOrganizationFromApiKey(request);
+  // Get the organization ID from the API key
+  const { organizationId, errorResponse } =
+    await getOrganizationFromApiKey(request);
 
-	// If there's an error response, return it
-	if (errorResponse) {
-		return errorResponse;
-	}
+  // If there's an error response, return it
+  if (errorResponse) {
+    return errorResponse;
+  }
 
-	try {
-		const body = await request.json();
+  try {
+    const body = await request.json();
 
-		// Validate the request body against the schema
-		const validationResult = riskCreateSchema.safeParse(body);
+    // Validate the request body against the schema
+    const validationResult = riskCreateSchema.safeParse(body);
 
-		if (!validationResult.success) {
-			// Return validation errors
-			return NextResponse.json(
-				{
-					success: false,
-					error: "Validation failed",
-					details: validationResult.error.format(),
-				},
-				{ status: 400 },
-			);
-		}
+    if (!validationResult.success) {
+      // Return validation errors
+      return NextResponse.json(
+        {
+          success: false,
+          error: "Validation failed",
+          details: validationResult.error.format(),
+        },
+        { status: 400 }
+      );
+    }
 
-		// Extract validated data
-		const validatedData: RiskCreateInput = validationResult.data;
+    // Extract validated data
+    const validatedData: RiskCreateInput = validationResult.data;
 
-		// Create the risk using the organization ID from the API key
-		const risk = await db.risk.create({
-			data: {
-				...validatedData,
-				organizationId: organizationId!,
-			},
-		});
+    // Create the risk using the organization ID from the API key
+    const risk = await db.risk.create({
+      data: {
+        ...validatedData,
+        organizationId: organizationId!,
+      },
+    });
 
-		// Format dates for JSON response
-		const formattedRisk = {
-			...risk,
-			createdAt: risk.createdAt.toISOString(),
-			updatedAt: risk.updatedAt.toISOString(),
-		};
+    // Format dates for JSON response
+    const formattedRisk = {
+      ...risk,
+      createdAt: risk.createdAt.toISOString(),
+      updatedAt: risk.updatedAt.toISOString(),
+    };
 
-		return NextResponse.json({
-			success: true,
-			data: formattedRisk,
-		});
-	} catch (error) {
-		console.error("Error creating risk:", error);
-		return NextResponse.json(
-			{
-				success: false,
-				error: "Failed to create risk",
-			},
-			{ status: 500 },
-		);
-	}
+    return NextResponse.json({
+      success: true,
+      data: formattedRisk,
+    });
+  } catch (error) {
+    console.error("Error creating risk:", error);
+    return NextResponse.json(
+      {
+        success: false,
+        error: "Failed to create risk",
+      },
+      { status: 500 }
+    );
+  }
 }
diff --git a/apps/app/src/components/forms/risks/task/update-task-form.tsx b/apps/app/src/components/forms/risks/task/update-task-form.tsx
index bcda35a637..631d2188c5 100644
--- a/apps/app/src/components/forms/risks/task/update-task-form.tsx
+++ b/apps/app/src/components/forms/risks/task/update-task-form.tsx
@@ -9,20 +9,20 @@ import { type Task, TaskStatus, type User } from "@comp/db/types";
 import { Button } from "@comp/ui/button";
 import { Calendar } from "@comp/ui/calendar";
 import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
+	Form,
+	FormControl,
+	FormField,
+	FormItem,
+	FormLabel,
+	FormMessage,
 } from "@comp/ui/form";
 import { Popover, PopoverContent, PopoverTrigger } from "@comp/ui/popover";
 import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
 } from "@comp/ui/select";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { format } from "date-fns";
@@ -35,162 +35,162 @@ import type { z } from "zod";
 import { cn } from "@comp/ui/cn";
 
 export function UpdateTaskForm({
-  task,
-  users,
+	task,
+	users,
 }: {
-  task: Task;
-  users: User[];
+	task: Task;
+	users: User[];
 }) {
-  const t = useI18n();
+	const t = useI18n();
 
-  const updateTask = useAction(updateTaskAction, {
-    onSuccess: () => {
-      toast.success("Task updated successfully");
-    },
-    onError: () => {
-      toast.error("Something went wrong, please try again.");
-    },
-  });
+	const updateTask = useAction(updateTaskAction, {
+		onSuccess: () => {
+			toast.success("Task updated successfully");
+		},
+		onError: () => {
+			toast.error("Something went wrong, please try again.");
+		},
+	});
 
-  const form = useForm<z.infer<typeof updateTaskSchema>>({
-    resolver: zodResolver(updateTaskSchema),
-    defaultValues: {
-      id: task.id,
-      dueDate: task.dueDate ? new Date(task.dueDate) : undefined,
-      assigneeId: task.assigneeId,
-      status: task.status ?? TaskStatus.open,
-    },
-  });
+	const form = useForm<z.infer<typeof updateTaskSchema>>({
+		resolver: zodResolver(updateTaskSchema),
+		defaultValues: {
+			id: task.id,
+			dueDate: task.dueDate ? new Date(task.dueDate) : undefined,
+			assigneeId: task.assigneeId,
+			status: task.status ?? TaskStatus.open,
+		},
+	});
 
-  const onSubmit = (data: z.infer<typeof updateTaskSchema>) => {
-    updateTask.execute({
-      id: data.id,
-      dueDate: data.dueDate ? data.dueDate : undefined,
-      assigneeId: data.assigneeId,
-      status: data.status as TaskStatus,
-    });
-  };
+	const onSubmit = (data: z.infer<typeof updateTaskSchema>) => {
+		updateTask.execute({
+			id: data.id,
+			dueDate: data.dueDate ? data.dueDate : undefined,
+			assigneeId: data.assigneeId,
+			status: data.status as TaskStatus,
+		});
+	};
 
-  return (
-    <Form {...form}>
-      <form onSubmit={form.handleSubmit(onSubmit)}>
-        <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-          <FormField
-            control={form.control}
-            name="assigneeId"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>{t("common.assignee.label")}</FormLabel>
-                <FormControl>
-                  <Select
-                    value={field.value}
-                    onValueChange={field.onChange}
-                    onOpenChange={() => form.handleSubmit(onSubmit)}
-                  >
-                    <SelectTrigger>
-                      <SelectValue
-                        placeholder={t("common.assignee.placeholder")}
-                      />
-                    </SelectTrigger>
-                    <SelectContent>
-                      <SelectUser
-                        isLoading={false}
-                        onSelect={field.onChange}
-                        selectedId={field.value}
-                        users={users}
-                      />
-                    </SelectContent>
-                  </Select>
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-          <FormField
-            control={form.control}
-            name="status"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>{t("risk.tasks.form.status")}</FormLabel>
-                <FormControl>
-                  <Select value={field.value} onValueChange={field.onChange}>
-                    <SelectTrigger>
-                      <SelectValue
-                        placeholder={t("risk.tasks.form.status_placeholder")}
-                      >
-                        {field.value && (
-                          <Status status={field.value as StatusType} />
-                        )}
-                      </SelectValue>
-                    </SelectTrigger>
-                    <SelectContent>
-                      {STATUS_TYPES.map((status) => (
-                        <SelectItem key={status} value={status}>
-                          <Status status={status} />
-                        </SelectItem>
-                      ))}
-                    </SelectContent>
-                  </Select>
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
+	return (
+		<Form {...form}>
+			<form onSubmit={form.handleSubmit(onSubmit)}>
+				<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+					<FormField
+						control={form.control}
+						name="assigneeId"
+						render={({ field }) => (
+							<FormItem>
+								<FormLabel>{t("common.assignee.label")}</FormLabel>
+								<FormControl>
+									<Select
+										value={field.value ?? ""}
+										onValueChange={field.onChange}
+										onOpenChange={() => form.handleSubmit(onSubmit)}
+									>
+										<SelectTrigger>
+											<SelectValue
+												placeholder={t("common.assignee.placeholder")}
+											/>
+										</SelectTrigger>
+										<SelectContent>
+											<SelectUser
+												isLoading={false}
+												onSelect={field.onChange}
+												selectedId={field.value ?? undefined}
+												users={users}
+											/>
+										</SelectContent>
+									</Select>
+								</FormControl>
+								<FormMessage />
+							</FormItem>
+						)}
+					/>
+					<FormField
+						control={form.control}
+						name="status"
+						render={({ field }) => (
+							<FormItem>
+								<FormLabel>{t("risk.tasks.form.status")}</FormLabel>
+								<FormControl>
+									<Select value={field.value} onValueChange={field.onChange}>
+										<SelectTrigger>
+											<SelectValue
+												placeholder={t("risk.tasks.form.status_placeholder")}
+											>
+												{field.value && (
+													<Status status={field.value as StatusType} />
+												)}
+											</SelectValue>
+										</SelectTrigger>
+										<SelectContent>
+											{STATUS_TYPES.map((status) => (
+												<SelectItem key={status} value={status}>
+													<Status status={status} />
+												</SelectItem>
+											))}
+										</SelectContent>
+									</Select>
+								</FormControl>
+								<FormMessage />
+							</FormItem>
+						)}
+					/>
 
-          <FormField
-            control={form.control}
-            name="dueDate"
-            render={({ field }) => (
-              <FormItem className="flex flex-col">
-                <FormLabel>{t("risk.tasks.form.due_date")}</FormLabel>
-                <Popover>
-                  <PopoverTrigger asChild>
-                    <FormControl>
-                      <Button
-                        variant={"outline"}
-                        className={cn(
-                          "pl-3 text-left font-normal",
-                          !field.value && "text-muted-foreground",
-                        )}
-                      >
-                        {field.value ? (
-                          format(field.value, "PPP")
-                        ) : (
-                          <span>{t("common.date.pick")}</span>
-                        )}
-                        <CalendarIcon className="ml-auto h-4 w-4 opacity-50" />
-                      </Button>
-                    </FormControl>
-                  </PopoverTrigger>
-                  <PopoverContent className="w-auto p-0" align="start">
-                    <Calendar
-                      mode="single"
-                      selected={field.value}
-                      onSelect={field.onChange}
-                      disabled={(date) => date <= new Date()}
-                      initialFocus
-                    />
-                  </PopoverContent>
-                </Popover>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-        </div>
-        <div className="flex justify-end mt-4">
-          <Button
-            type="submit"
-            variant="action"
-            disabled={updateTask.status === "executing"}
-          >
-            {updateTask.status === "executing" ? (
-              <Loader2 className="h-4 w-4 animate-spin" />
-            ) : (
-              t("common.actions.save")
-            )}
-          </Button>
-        </div>
-      </form>
-    </Form>
-  );
+					<FormField
+						control={form.control}
+						name="dueDate"
+						render={({ field }) => (
+							<FormItem className="flex flex-col">
+								<FormLabel>{t("risk.tasks.form.due_date")}</FormLabel>
+								<Popover>
+									<PopoverTrigger asChild>
+										<FormControl>
+											<Button
+												variant={"outline"}
+												className={cn(
+													"pl-3 text-left font-normal",
+													!field.value && "text-muted-foreground",
+												)}
+											>
+												{field.value ? (
+													format(field.value, "PPP")
+												) : (
+													<span>{t("common.date.pick")}</span>
+												)}
+												<CalendarIcon className="ml-auto h-4 w-4 opacity-50" />
+											</Button>
+										</FormControl>
+									</PopoverTrigger>
+									<PopoverContent className="w-auto p-0" align="start">
+										<Calendar
+											mode="single"
+											selected={field.value}
+											onSelect={field.onChange}
+											disabled={(date) => date <= new Date()}
+											initialFocus
+										/>
+									</PopoverContent>
+								</Popover>
+								<FormMessage />
+							</FormItem>
+						)}
+					/>
+				</div>
+				<div className="flex justify-end mt-4">
+					<Button
+						type="submit"
+						variant="action"
+						disabled={updateTask.status === "executing"}
+					>
+						{updateTask.status === "executing" ? (
+							<Loader2 className="h-4 w-4 animate-spin" />
+						) : (
+							t("common.actions.save")
+						)}
+					</Button>
+				</div>
+			</form>
+		</Form>
+	);
 }
diff --git a/apps/app/src/components/forms/risks/task/update-task-overview-form.tsx b/apps/app/src/components/forms/risks/task/update-task-overview-form.tsx
index 642263126e..b7c7a99ec2 100644
--- a/apps/app/src/components/forms/risks/task/update-task-overview-form.tsx
+++ b/apps/app/src/components/forms/risks/task/update-task-overview-form.tsx
@@ -6,12 +6,12 @@ import { useI18n } from "@/locales/client";
 import type { Task } from "@comp/db/types";
 import { Button } from "@comp/ui/button";
 import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
+	Form,
+	FormControl,
+	FormField,
+	FormItem,
+	FormLabel,
+	FormMessage,
 } from "@comp/ui/form";
 import { Input } from "@comp/ui/input";
 import { Textarea } from "@comp/ui/textarea";
@@ -24,101 +24,101 @@ import { toast } from "sonner";
 import type { z } from "zod";
 
 export function UpdateTaskOverviewForm({
-  task,
+	task,
 }: {
-  task: Task;
+	task: Task;
 }) {
-  const t = useI18n();
-  const [open, setOpen] = useQueryState("task-update-overview-sheet");
+	const t = useI18n();
+	const [open, setOpen] = useQueryState("task-update-overview-sheet");
 
-  const updateTask = useAction(updateTaskAction, {
-    onSuccess: () => {
-      toast.success(t("risk.form.update_risk_success"));
-      setOpen(null);
-    },
-    onError: () => {
-      toast.error(t("risk.form.update_risk_error"));
-    },
-  });
+	const updateTask = useAction(updateTaskAction, {
+		onSuccess: () => {
+			toast.success(t("risk.form.update_risk_success"));
+			setOpen(null);
+		},
+		onError: () => {
+			toast.error(t("risk.form.update_risk_error"));
+		},
+	});
 
-  const form = useForm<z.infer<typeof updateTaskSchema>>({
-    resolver: zodResolver(updateTaskSchema),
-    defaultValues: {
-      id: task.id,
-      title: task.title,
-      description: task.description,
-      dueDate: task.dueDate ? new Date(task.dueDate) : undefined,
-      status: task.status,
-      assigneeId: task.assigneeId,
-    },
-  });
+	const form = useForm<z.infer<typeof updateTaskSchema>>({
+		resolver: zodResolver(updateTaskSchema),
+		defaultValues: {
+			id: task.id,
+			title: task.title,
+			description: task.description,
+			dueDate: task.dueDate ? new Date(task.dueDate) : undefined,
+			status: task.status,
+			assigneeId: task.assigneeId,
+		},
+	});
 
-  const onSubmit = (values: z.infer<typeof updateTaskSchema>) => {
-    updateTask.execute({
-      id: values.id,
-      title: values.title,
-      description: values.description,
-      dueDate: values.dueDate,
-      status: values.status,
-      assigneeId: values.assigneeId,
-    });
-  };
+	const onSubmit = (values: z.infer<typeof updateTaskSchema>) => {
+		updateTask.execute({
+			id: values.id,
+			title: values.title,
+			description: values.description,
+			dueDate: values.dueDate,
+			status: values.status,
+			assigneeId: values.assigneeId,
+		});
+	};
 
-  return (
-    <Form {...form}>
-      <form onSubmit={form.handleSubmit(onSubmit)}>
-        <div className="space-y-4">
-          <FormField
-            control={form.control}
-            name="title"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>{t("risk.tasks.form.task_title")}</FormLabel>
-                <FormControl>
-                  <Input
-                    {...field}
-                    autoFocus
-                    className="mt-3"
-                    placeholder={t("risk.tasks.form.task_title_description")}
-                    autoCorrect="off"
-                  />
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-          <FormField
-            control={form.control}
-            name="description"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>Description</FormLabel>
-                <FormControl>
-                  <Textarea
-                    {...field}
-                    className="mt-3 min-h-[80px]"
-                    placeholder={t("risk.tasks.form.description_description")}
-                  />
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-        </div>
-        <div className="flex justify-end mt-8">
-          <Button
-            type="submit"
-            variant="action"
-            disabled={updateTask.status === "executing"}
-          >
-            {updateTask.status === "executing" ? (
-              <Loader2 className="h-4 w-4 animate-spin" />
-            ) : (
-              t("common.actions.save")
-            )}
-          </Button>
-        </div>
-      </form>
-    </Form>
-  );
+	return (
+		<Form {...form}>
+			<form onSubmit={form.handleSubmit(onSubmit)}>
+				<div className="space-y-4">
+					<FormField
+						control={form.control}
+						name="title"
+						render={({ field }) => (
+							<FormItem>
+								<FormLabel>{t("risk.tasks.form.task_title")}</FormLabel>
+								<FormControl>
+									<Input
+										{...field}
+										autoFocus
+										className="mt-3"
+										placeholder={t("risk.tasks.form.task_title_description")}
+										autoCorrect="off"
+									/>
+								</FormControl>
+								<FormMessage />
+							</FormItem>
+						)}
+					/>
+					<FormField
+						control={form.control}
+						name="description"
+						render={({ field }) => (
+							<FormItem>
+								<FormLabel>Description</FormLabel>
+								<FormControl>
+									<Textarea
+										{...field}
+										className="mt-3 min-h-[80px]"
+										placeholder={t("risk.tasks.form.description_description")}
+									/>
+								</FormControl>
+								<FormMessage />
+							</FormItem>
+						)}
+					/>
+				</div>
+				<div className="flex justify-end mt-8">
+					<Button
+						type="submit"
+						variant="action"
+						disabled={updateTask.status === "executing"}
+					>
+						{updateTask.status === "executing" ? (
+							<Loader2 className="h-4 w-4 animate-spin" />
+						) : (
+							t("common.actions.save")
+						)}
+					</Button>
+				</div>
+			</form>
+		</Form>
+	);
 }
diff --git a/apps/app/src/components/forms/risks/update-risk-form.tsx b/apps/app/src/components/forms/risks/update-risk-form.tsx
index e67492f4d1..c38217648c 100644
--- a/apps/app/src/components/forms/risks/update-risk-form.tsx
+++ b/apps/app/src/components/forms/risks/update-risk-form.tsx
@@ -6,12 +6,12 @@ import { useI18n } from "@/locales/client";
 import { Departments, type Risk } from "@comp/db/types";
 import { Button } from "@comp/ui/button";
 import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
+	Form,
+	FormControl,
+	FormField,
+	FormItem,
+	FormLabel,
+	FormMessage,
 } from "@comp/ui/form";
 import { Input } from "@comp/ui/input";
 import { Textarea } from "@comp/ui/textarea";
@@ -24,103 +24,103 @@ import { toast } from "sonner";
 import type { z } from "zod";
 
 export function UpdateRiskForm({
-  risk,
+	risk,
 }: {
-  risk: Risk;
+	risk: Risk;
 }) {
-  const t = useI18n();
-  const [open, setOpen] = useQueryState("risk-overview-sheet");
+	const t = useI18n();
+	const [open, setOpen] = useQueryState("risk-overview-sheet");
 
-  const updateRisk = useAction(updateRiskAction, {
-    onSuccess: () => {
-      toast.success(t("risk.form.update_risk_success"));
-      setOpen(null);
-    },
-    onError: () => {
-      toast.error(t("risk.form.update_risk_error"));
-    },
-  });
+	const updateRisk = useAction(updateRiskAction, {
+		onSuccess: () => {
+			toast.success(t("risk.form.update_risk_success"));
+			setOpen(null);
+		},
+		onError: () => {
+			toast.error(t("risk.form.update_risk_error"));
+		},
+	});
 
-  const form = useForm<z.infer<typeof updateRiskSchema>>({
-    resolver: zodResolver(updateRiskSchema),
-    defaultValues: {
-      id: risk.id,
-      title: risk.title,
-      description: risk.description,
-      category: risk.category,
-      department: risk.department ?? Departments.admin,
-      status: risk.status,
-      assigneeId: risk.assigneeId,
-    },
-  });
+	const form = useForm<z.infer<typeof updateRiskSchema>>({
+		resolver: zodResolver(updateRiskSchema),
+		defaultValues: {
+			id: risk.id,
+			title: risk.title,
+			description: risk.description,
+			category: risk.category,
+			department: risk.department ?? Departments.admin,
+			status: risk.status,
+			assigneeId: risk.assigneeId,
+		},
+	});
 
-  const onSubmit = (data: z.infer<typeof updateRiskSchema>) => {
-    updateRisk.execute({
-      id: data.id,
-      title: data.title,
-      description: data.description,
-      category: data.category,
-      department: data.department,
-      status: data.status,
-      assigneeId: data.assigneeId,
-    });
-  };
+	const onSubmit = (data: z.infer<typeof updateRiskSchema>) => {
+		updateRisk.execute({
+			id: data.id,
+			title: data.title,
+			description: data.description,
+			category: data.category,
+			department: data.department,
+			status: data.status,
+			assigneeId: data.assigneeId,
+		});
+	};
 
-  return (
-    <Form {...form}>
-      <form onSubmit={form.handleSubmit(onSubmit)}>
-        <div className="space-y-4">
-          <FormField
-            control={form.control}
-            name="title"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>{t("risk.form.risk_title")}</FormLabel>
-                <FormControl>
-                  <Input
-                    {...field}
-                    autoFocus
-                    className="mt-3"
-                    placeholder={t("risk.form.risk_title_description")}
-                    autoCorrect="off"
-                  />
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-          <FormField
-            control={form.control}
-            name="description"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>Description</FormLabel>
-                <FormControl>
-                  <Textarea
-                    {...field}
-                    className="mt-3 min-h-[80px]"
-                    placeholder={t("risk.form.risk_description_description")}
-                  />
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-        </div>
-        <div className="flex justify-end mt-8">
-          <Button
-            type="submit"
-            variant="action"
-            disabled={updateRisk.status === "executing"}
-          >
-            {updateRisk.status === "executing" ? (
-              <Loader2 className="h-4 w-4 animate-spin" />
-            ) : (
-              t("common.actions.save")
-            )}
-          </Button>
-        </div>
-      </form>
-    </Form>
-  );
+	return (
+		<Form {...form}>
+			<form onSubmit={form.handleSubmit(onSubmit)}>
+				<div className="space-y-4">
+					<FormField
+						control={form.control}
+						name="title"
+						render={({ field }) => (
+							<FormItem>
+								<FormLabel>{t("risk.form.risk_title")}</FormLabel>
+								<FormControl>
+									<Input
+										{...field}
+										autoFocus
+										className="mt-3"
+										placeholder={t("risk.form.risk_title_description")}
+										autoCorrect="off"
+									/>
+								</FormControl>
+								<FormMessage />
+							</FormItem>
+						)}
+					/>
+					<FormField
+						control={form.control}
+						name="description"
+						render={({ field }) => (
+							<FormItem>
+								<FormLabel>Description</FormLabel>
+								<FormControl>
+									<Textarea
+										{...field}
+										className="mt-3 min-h-[80px]"
+										placeholder={t("risk.form.risk_description_description")}
+									/>
+								</FormControl>
+								<FormMessage />
+							</FormItem>
+						)}
+					/>
+				</div>
+				<div className="flex justify-end mt-8">
+					<Button
+						type="submit"
+						variant="action"
+						disabled={updateRisk.status === "executing"}
+					>
+						{updateRisk.status === "executing" ? (
+							<Loader2 className="h-4 w-4 animate-spin" />
+						) : (
+							t("common.actions.save")
+						)}
+					</Button>
+				</div>
+			</form>
+		</Form>
+	);
 }
diff --git a/apps/app/src/components/policies/charts/policies-by-assignee.tsx b/apps/app/src/components/policies/charts/policies-by-assignee.tsx
new file mode 100644
index 0000000000..40d65e9b9e
--- /dev/null
+++ b/apps/app/src/components/policies/charts/policies-by-assignee.tsx
@@ -0,0 +1,247 @@
+import { getI18n } from "@/locales/server";
+import { db } from "@comp/db";
+import { PolicyStatus } from "@comp/db/types";
+import { Card, CardContent, CardHeader, CardTitle } from "@comp/ui/card";
+import type { CSSProperties } from "react";
+
+interface Props {
+	organizationId: string;
+}
+
+interface UserPolicyStats {
+	user: {
+		id: string;
+		name: string | null;
+		image: string | null;
+	};
+	totalPolicies: number;
+	publishedPolicies: number;
+	draftPolicies: number;
+	archivedPolicies: number;
+	needsReviewPolicies: number;
+}
+
+const policyStatus = {
+	published: "bg-primary",
+	draft: "bg-[var(--chart-open)]",
+	archived: "bg-[var(--chart-pending)]",
+	needs_review: "bg-[hsl(var(--destructive))]",
+} as const;
+
+export async function PoliciesByAssignee({ organizationId }: Props) {
+	const t = await getI18n();
+	const [userStats, policies] = await Promise.all([
+		userData(organizationId),
+		policiesByUser(organizationId),
+	]);
+
+	const stats: UserPolicyStats[] = userStats.map((user) => {
+		const userPolicies = policies.filter(
+			(policy) => policy.assigneeId === user.id,
+		);
+
+		return {
+			user: {
+				id: user.id,
+				name: user.name,
+				image: user.image,
+			},
+			totalPolicies: userPolicies.length,
+			publishedPolicies: userPolicies.filter(
+				(policy) => policy.status === PolicyStatus.published,
+			).length,
+			draftPolicies: userPolicies.filter(
+				(policy) => policy.status === PolicyStatus.draft,
+			).length,
+			archivedPolicies: userPolicies.filter((policy) => policy.isArchived)
+				.length,
+			needsReviewPolicies: userPolicies.filter(
+				(policy) => policy.status === PolicyStatus.needs_review,
+			).length,
+		};
+	});
+
+	stats.sort((a, b) => b.totalPolicies - a.totalPolicies);
+
+	return (
+		<Card>
+			<CardHeader>
+				<CardTitle>{t("policies.dashboard.policies_by_assignee")}</CardTitle>
+			</CardHeader>
+			<CardContent>
+				<div className="space-y-8">
+					{stats.map((stat) => (
+						<div key={stat.user.id} className="space-y-2">
+							<div className="flex justify-between items-center">
+								<p className="text-sm">{stat.user.name || "Unknown User"}</p>
+								<span className="text-sm text-muted-foreground">
+									{stat.totalPolicies} {t("policies.policies")}
+								</span>
+							</div>
+
+							<RiskBarChart stat={stat} t={t} />
+
+							<div className="flex flex-wrap gap-3 text-xs text-muted-foreground">
+								<div className="flex items-center gap-1">
+									<div className="size-2 bg-primary" />
+									<span>
+										{t("common.status.published")} ({stat.publishedPolicies})
+									</span>
+								</div>
+								<div className="flex items-center gap-1">
+									<div className="size-2 bg-[var(--chart-open)]" />
+									<span>
+										{t("common.status.draft")} ({stat.draftPolicies})
+									</span>
+								</div>
+								<div className="flex items-center gap-1">
+									<div className="size-2 bg-[var(--chart-pending)]" />
+									<span>
+										{t("common.status.archived")} ({stat.archivedPolicies})
+									</span>
+								</div>
+								<div className="flex items-center gap-1">
+									<div className="size-2 bg-[hsl(var(--destructive))]" />
+									<span>
+										{t("common.status.needs_review")} (
+										{stat.needsReviewPolicies})
+									</span>
+								</div>
+							</div>
+						</div>
+					))}
+				</div>
+			</CardContent>
+		</Card>
+	);
+}
+
+function RiskBarChart({ stat, t }: { stat: UserPolicyStats; t: any }) {
+	const data = [
+		...(stat.publishedPolicies && stat.publishedPolicies > 0
+			? [
+					{
+						key: "published",
+						value: stat.publishedPolicies,
+						color: policyStatus.published,
+						label: t("common.status.published"),
+					},
+				]
+			: []),
+		...(stat.draftPolicies && stat.draftPolicies > 0
+			? [
+					{
+						key: "draft",
+						value: stat.draftPolicies,
+						color: policyStatus.draft,
+						label: t("common.status.draft"),
+					},
+				]
+			: []),
+		...(stat.archivedPolicies && stat.archivedPolicies > 0
+			? [
+					{
+						key: "archived",
+						value: stat.archivedPolicies,
+						color: policyStatus.archived,
+						label: t("common.status.archived"),
+					},
+				]
+			: []),
+	];
+
+	const gap = 0.3;
+	const totalValue = stat.totalPolicies;
+	const barHeight = 12;
+	const totalWidth = totalValue + gap * (data.length - 1);
+	let cumulativeWidth = 0;
+	const cornerRadius = 0;
+
+	if (totalValue === 0) {
+		return <div className="h-3 bg-muted" />;
+	}
+
+	return (
+		<div
+			className="relative h-[var(--height)]"
+			style={
+				{
+					"--marginTop": "0px",
+					"--marginRight": "0px",
+					"--marginBottom": "0px",
+					"--marginLeft": "0px",
+					"--height": `${barHeight}px`,
+				} as CSSProperties
+			}
+		>
+			<div
+				className="absolute inset-0
+          h-[calc(100%-var(--marginTop)-var(--marginBottom))]
+          w-[calc(100%-var(--marginLeft)-var(--marginRight))]
+          translate-x-[var(--marginLeft)]
+          translate-y-[var(--marginTop)]
+          overflow-visible
+        "
+			>
+				{data.map((d, index) => {
+					const barWidth = (d.value / totalWidth) * 100;
+					const xPosition = cumulativeWidth;
+					cumulativeWidth += barWidth + gap;
+
+					return (
+						<div
+							key={d.key}
+							className="relative"
+							style={{
+								width: `${barWidth}%`,
+								height: `${barHeight}px`,
+								left: `${xPosition}%`,
+								position: "absolute",
+							}}
+						>
+							<div
+								className={`bg-gradient-to-b ${d.color}`}
+								style={{
+									width: "100%",
+									height: "100%",
+									borderRadius: `${cornerRadius}px`,
+								}}
+								title={`${d.label}: ${d.value}`}
+							/>
+						</div>
+					);
+				})}
+			</div>
+		</div>
+	);
+}
+
+const policiesByUser = async (organizationId: string) => {
+	return await db.policy.findMany({
+		where: {
+			organizationId,
+		},
+		select: {
+			assigneeId: true,
+			status: true,
+			isArchived: true,
+		},
+	});
+};
+
+const userData = async (organizationId: string) => {
+	return await db.user.findMany({
+		where: {
+			members: {
+				some: {
+					organizationId,
+				},
+			},
+		},
+		select: {
+			id: true,
+			name: true,
+			image: true,
+		},
+	});
+};
diff --git a/apps/app/src/components/tables/policies/filter-toolbar.tsx b/apps/app/src/components/tables/policies/filter-toolbar.tsx
index b7acb3fe35..06a881a8ab 100644
--- a/apps/app/src/components/tables/policies/filter-toolbar.tsx
+++ b/apps/app/src/components/tables/policies/filter-toolbar.tsx
@@ -47,7 +47,7 @@ export function FilterToolbar({ isEmpty = false, users }: FilterToolbarProps) {
 		parse: (value) => value || null,
 	});
 
-	const [ownerId, setOwnerId] = useQueryState("ownerId", {
+	const [assigneeId, setAssigneeId] = useQueryState("assigneeId", {
 		shallow: false,
 		history: "push",
 		parse: (value) => value || null,
@@ -78,13 +78,13 @@ export function FilterToolbar({ isEmpty = false, users }: FilterToolbarProps) {
 		startTransition(() => {
 			setSearch(null);
 			setStatus(null);
-			setOwnerId(null);
+			setAssigneeId(null);
 			setSort(null);
 			setSearchInput("");
 		});
-	}, [setSearch, setStatus, setOwnerId, setSort]);
+	}, [setSearch, setStatus, setAssigneeId, setSort]);
 
-	const hasFilters = search || status || ownerId || sort;
+	const hasFilters = search || status || assigneeId || sort;
 
 	const handleStatusChange = (value: string) => {
 		setStatus(value === "all" ? null : value);
@@ -154,11 +154,11 @@ export function FilterToolbar({ isEmpty = false, users }: FilterToolbarProps) {
 				</Select>
 
 				<Select
-					value={ownerId || ""}
-					onValueChange={(value) => setOwnerId(value || null)}
+					value={assigneeId || ""}
+					onValueChange={(value) => setAssigneeId(value || null)}
 				>
 					<SelectTrigger className="w-[200px] min-w-[200px]">
-						<SelectValue placeholder={t("common.filters.owner.label")} />
+						<SelectValue placeholder={t("common.filters.assignee.label")} />
 					</SelectTrigger>
 					<SelectContent>
 						{users.map((user) => (
diff --git a/apps/app/src/components/tables/risk-register/columns.tsx b/apps/app/src/components/tables/risk-register/columns.tsx
index 67e100edac..fe2a5af4a5 100644
--- a/apps/app/src/components/tables/risk-register/columns.tsx
+++ b/apps/app/src/components/tables/risk-register/columns.tsx
@@ -5,7 +5,6 @@ import { useI18n } from "@/locales/client";
 import type { Departments, RiskStatus } from "@comp/db/types";
 import { Badge } from "@comp/ui/badge";
 import { Button } from "@comp/ui/button";
-import { cn } from "@comp/ui/cn";
 import type { ColumnDef } from "@tanstack/react-table";
 import Link from "next/link";
 import { useParams } from "next/navigation";
@@ -15,10 +14,12 @@ export type RiskRegisterType = {
 	title: string;
 	status: RiskStatus;
 	department?: Departments;
-	ownerId: string;
-	owner: {
-		image: string;
-		name: string;
+	assigneeId: string;
+	assignee: {
+		user: {
+			image: string;
+			name: string;
+		};
 	};
 };
 
@@ -89,8 +90,8 @@ export function columns(): ColumnDef<RiskRegisterType>[] {
 			},
 		},
 		{
-			id: "ownerId",
-			accessorKey: "ownerId",
+			id: "assigneeId",
+			accessorKey: "assigneeId",
 			header: () => (
 				<span className="hidden md:table-cell">
 					{t("common.assignee.label")}
@@ -100,8 +101,8 @@ export function columns(): ColumnDef<RiskRegisterType>[] {
 				return (
 					<div className="hidden md:table-cell">
 						<AssignedUser
-							fullName={row.original.owner?.name}
-							avatarUrl={row.original.owner?.image}
+							fullName={row.original.assignee?.user?.name}
+							avatarUrl={row.original.assignee?.user?.image}
 						/>
 					</div>
 				);
diff --git a/apps/app/src/components/tables/risk-register/data-table-header.tsx b/apps/app/src/components/tables/risk-register/data-table-header.tsx
index 0fedf0cba6..d0e56f1df4 100644
--- a/apps/app/src/components/tables/risk-register/data-table-header.tsx
+++ b/apps/app/src/components/tables/risk-register/data-table-header.tsx
@@ -107,18 +107,18 @@ export function DataTableHeader({ table, loading }: Props) {
 					</TableHead>
 				)}
 
-				{isVisible("ownerId") && (
+				{isVisible("assigneeId") && (
 					<TableHead className="min-w-[120px] px-3 md:px-4 py-2 hidden md:table-cell">
 						<Button
 							className="p-0 hover:bg-transparent space-x-2"
 							variant="ghost"
-							onClick={() => createSortQuery("ownerId")}
+							onClick={() => createSortQuery("assigneeId")}
 						>
 							<span>{t("common.assignee.label")}</span>
-							{"ownerId" === column && value === "asc" && (
+							{"assigneeId" === column && value === "asc" && (
 								<ArrowDown size={16} />
 							)}
-							{"ownerId" === column && value === "desc" && (
+							{"assigneeId" === column && value === "desc" && (
 								<ArrowUp size={16} />
 							)}
 						</Button>
diff --git a/apps/app/src/components/tables/risk-register/data-table.tsx b/apps/app/src/components/tables/risk-register/data-table.tsx
index f8b4386f6c..e936468bf5 100644
--- a/apps/app/src/components/tables/risk-register/data-table.tsx
+++ b/apps/app/src/components/tables/risk-register/data-table.tsx
@@ -16,7 +16,7 @@ interface DataTableProps<TData, TValue> {
 		title: string;
 		status: string;
 		department: string;
-		ownerId: string;
+		assigneeId: string;
 	};
 	data: TData[];
 	pageCount: number;
@@ -60,7 +60,7 @@ export function DataTable<TData, TValue>({
 										key={cell.id}
 										className={cn(
 											(cell.column.id === "department" ||
-												cell.column.id === "ownerId" ||
+												cell.column.id === "assigneeId" ||
 												cell.column.id === "assignedTo" ||
 												cell.column.id === "status") &&
 												"hidden md:table-cell",
diff --git a/apps/app/src/components/tables/risk-register/filter-toolbar.tsx b/apps/app/src/components/tables/risk-register/filter-toolbar.tsx
index a0217a3f59..ddef8b3747 100644
--- a/apps/app/src/components/tables/risk-register/filter-toolbar.tsx
+++ b/apps/app/src/components/tables/risk-register/filter-toolbar.tsx
@@ -2,21 +2,16 @@
 
 import { CreateRiskSheet } from "@/components/sheets/create-risk-sheet";
 import { useI18n } from "@/locales/client";
-import {
-  Departments,
-  Member,
-  RiskStatus,
-  User,
-} from "@comp/db/types";
+import { Departments, Member, RiskStatus, User } from "@comp/db/types";
 import { Button } from "@comp/ui/button";
 import { cn } from "@comp/ui/cn";
 import { Input } from "@comp/ui/input";
 import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
 } from "@comp/ui/select";
 import { Skeleton } from "@comp/ui/skeleton";
 import { Search, X } from "lucide-react";
@@ -29,181 +24,183 @@ const riskStatuses = Object.values(RiskStatus);
 const departments = Object.values(Departments).filter((d) => d !== "none");
 
 type Props = {
-  isEmpty?: boolean;
-  users: (Member & { user: User })[];
+	isEmpty?: boolean;
+	users: (Member & { user: User })[];
 };
 
 const statusTranslationKeys = {
-  open: "common.status.open",
-  pending: "common.status.pending",
-  closed: "common.status.closed",
-  archived: "common.status.archived",
+	open: "common.status.open",
+	pending: "common.status.pending",
+	closed: "common.status.closed",
+	archived: "common.status.archived",
 } as const;
 
 export function FilterToolbar({ isEmpty, users }: Props) {
-  const t = useI18n();
-  const [isPending, startTransition] = useTransition();
-  const [open, setOpen] = useQueryState("create-risk-sheet");
-
-  const [search, setSearch] = useQueryState("search", {
-    shallow: false,
-    history: "push",
-    parse: (value) => value || null,
-  });
-
-  const [category, setCategory] = useQueryState("category", {
-    shallow: false,
-    history: "push",
-    parse: (value) => value || null,
-  });
-
-  const [status, setStatus] = useQueryState("status", {
-    shallow: false,
-    history: "push",
-    parse: (value) => value || null,
-  });
-
-  const [department, setDepartment] = useQueryState("department", {
-    shallow: false,
-    history: "push",
-    parse: (value) => value || null,
-  });
-
-  const [ownerId, setOwnerId] = useQueryState("ownerId", {
-    shallow: false,
-    history: "push",
-    parse: (value) => value || null,
-  });
-
-  const handleReset = useCallback(() => {
-    startTransition(() => {
-      Promise.all([
-        setSearch(null),
-        setCategory(null),
-        setStatus(null),
-        setDepartment(null),
-        setOwnerId(null),
-      ]);
-    });
-  }, [setSearch, setCategory, setStatus, setDepartment, setOwnerId]);
-
-  const hasFilters = search || category || status || department || ownerId;
-
-  if (isEmpty) {
-    return (
-      <div className="flex flex-col gap-4 md:flex-row md:items-center md:justify-between mb-4 opacity-20 pointer-events-none blur-[7px]">
-        <div className="relative flex-1 md:max-w-sm">
-          <Skeleton className={cn("h-10", isEmpty && "animate-none")} />
-        </div>
-
-        <div className="md:flex gap-2 md:flex-row md:items-center hidden">
-          <Skeleton
-            className={cn("h-10 w-[200px]", isEmpty && "animate-none")}
-          />
-          <Skeleton
-            className={cn("h-10 w-[200px]", isEmpty && "animate-none")}
-          />
-          <Skeleton
-            className={cn("h-9 w-[120px]", isEmpty && "animate-none")}
-          />
-        </div>
-      </div>
-    );
-  }
-
-  return (
-    <div className="flex flex-row items-center justify-between gap-2 mb-4">
-      <div className="flex flex-1 items-center gap-2 min-w-0">
-        <div className="relative flex-1 md:max-w-sm">
-          <Search className="absolute left-2 top-2.5 h-4 w-4 text-muted-foreground" />
-          <Input
-            placeholder={t("common.filters.search")}
-            className="pl-8"
-            value={search || ""}
-            onChange={(e) => setSearch(e.target.value || null)}
-          />
-        </div>
-
-        <div className="md:hidden">
-          <Button onClick={() => setOpen("true")} variant="action">
-            <Plus className="h-4 w-4" />
-            {t("common.actions.addNew")}
-          </Button>
-        </div>
-      </div>
-
-      <div className="hidden md:flex items-center gap-2">
-        <Select
-          value={status || ""}
-          onValueChange={(value) => setStatus(value || null)}
-        >
-          <SelectTrigger className="w-auto min-w-[100px]">
-            <SelectValue placeholder={t("common.filters.status")} />
-          </SelectTrigger>
-          <SelectContent>
-            {riskStatuses.map((stat) => (
-              <SelectItem key={stat} value={stat}>
-                {t(
-                  statusTranslationKeys[
-                  stat.toLowerCase() as keyof typeof statusTranslationKeys
-                  ],
-                )}
-              </SelectItem>
-            ))}
-          </SelectContent>
-        </Select>
-
-        <Select
-          value={department || ""}
-          onValueChange={(value) => setDepartment(value || null)}
-        >
-          <SelectTrigger className="w-[150px] min-w-[150px]">
-            <SelectValue placeholder={t("common.filters.department")} />
-          </SelectTrigger>
-          <SelectContent>
-            {departments.map((dept) => (
-              <SelectItem key={dept} value={dept}>
-                {dept.replace(/_/g, " ").toUpperCase()}
-              </SelectItem>
-            ))}
-          </SelectContent>
-        </Select>
-
-        <Select
-          value={ownerId || ""}
-          onValueChange={(value) => setOwnerId(value || null)}
-        >
-          <SelectTrigger className="w-[200px] min-w-[200px]">
-            <SelectValue placeholder={t("common.filters.owner.placeholder")} />
-          </SelectTrigger>
-          <SelectContent>
-            {users.map((user) => (
-              <SelectItem key={user.id} value={user.id}>
-                {user.user.name}
-              </SelectItem>
-            ))}
-          </SelectContent>
-        </Select>
-
-        {hasFilters && (
-          <Button
-            variant="ghost"
-            size="sm"
-            onClick={handleReset}
-            disabled={isPending}
-          >
-            <X className="h-4 w-4 mr-2" />
-            {t("common.actions.clear")}
-          </Button>
-        )}
-
-        <Button onClick={() => setOpen("true")} variant="action">
-          <Plus className="h-4 w-4" />
-          {t("common.actions.addNew")}
-        </Button>
-      </div>
-
-      <CreateRiskSheet assignees={users} />
-    </div>
-  );
+	const t = useI18n();
+	const [isPending, startTransition] = useTransition();
+	const [open, setOpen] = useQueryState("create-risk-sheet");
+
+	const [search, setSearch] = useQueryState("search", {
+		shallow: false,
+		history: "push",
+		parse: (value) => value || null,
+	});
+
+	const [category, setCategory] = useQueryState("category", {
+		shallow: false,
+		history: "push",
+		parse: (value) => value || null,
+	});
+
+	const [status, setStatus] = useQueryState("status", {
+		shallow: false,
+		history: "push",
+		parse: (value) => value || null,
+	});
+
+	const [department, setDepartment] = useQueryState("department", {
+		shallow: false,
+		history: "push",
+		parse: (value) => value || null,
+	});
+
+	const [assigneeId, setAssigneeId] = useQueryState("assigneeId", {
+		shallow: false,
+		history: "push",
+		parse: (value) => value || null,
+	});
+
+	const handleReset = useCallback(() => {
+		startTransition(() => {
+			Promise.all([
+				setSearch(null),
+				setCategory(null),
+				setStatus(null),
+				setDepartment(null),
+				setAssigneeId(null),
+			]);
+		});
+	}, [setSearch, setCategory, setStatus, setDepartment, setAssigneeId]);
+
+	const hasFilters = search || category || status || department || assigneeId;
+
+	if (isEmpty) {
+		return (
+			<div className="flex flex-col gap-4 md:flex-row md:items-center md:justify-between mb-4 opacity-20 pointer-events-none blur-[7px]">
+				<div className="relative flex-1 md:max-w-sm">
+					<Skeleton className={cn("h-10", isEmpty && "animate-none")} />
+				</div>
+
+				<div className="md:flex gap-2 md:flex-row md:items-center hidden">
+					<Skeleton
+						className={cn("h-10 w-[200px]", isEmpty && "animate-none")}
+					/>
+					<Skeleton
+						className={cn("h-10 w-[200px]", isEmpty && "animate-none")}
+					/>
+					<Skeleton
+						className={cn("h-9 w-[120px]", isEmpty && "animate-none")}
+					/>
+				</div>
+			</div>
+		);
+	}
+
+	return (
+		<div className="flex flex-row items-center justify-between gap-2 mb-4">
+			<div className="flex flex-1 items-center gap-2 min-w-0">
+				<div className="relative flex-1 md:max-w-sm">
+					<Search className="absolute left-2 top-2.5 h-4 w-4 text-muted-foreground" />
+					<Input
+						placeholder={t("common.filters.search")}
+						className="pl-8"
+						value={search || ""}
+						onChange={(e) => setSearch(e.target.value || null)}
+					/>
+				</div>
+
+				<div className="md:hidden">
+					<Button onClick={() => setOpen("true")} variant="action">
+						<Plus className="h-4 w-4" />
+						{t("common.actions.addNew")}
+					</Button>
+				</div>
+			</div>
+
+			<div className="hidden md:flex items-center gap-2">
+				<Select
+					value={status || ""}
+					onValueChange={(value) => setStatus(value || null)}
+				>
+					<SelectTrigger className="w-auto min-w-[100px]">
+						<SelectValue placeholder={t("common.filters.status")} />
+					</SelectTrigger>
+					<SelectContent>
+						{riskStatuses.map((stat) => (
+							<SelectItem key={stat} value={stat}>
+								{t(
+									statusTranslationKeys[
+										stat.toLowerCase() as keyof typeof statusTranslationKeys
+									],
+								)}
+							</SelectItem>
+						))}
+					</SelectContent>
+				</Select>
+
+				<Select
+					value={department || ""}
+					onValueChange={(value) => setDepartment(value || null)}
+				>
+					<SelectTrigger className="w-[150px] min-w-[150px]">
+						<SelectValue placeholder={t("common.filters.department")} />
+					</SelectTrigger>
+					<SelectContent>
+						{departments.map((dept) => (
+							<SelectItem key={dept} value={dept}>
+								{dept.replace(/_/g, " ").toUpperCase()}
+							</SelectItem>
+						))}
+					</SelectContent>
+				</Select>
+
+				<Select
+					value={assigneeId || ""}
+					onValueChange={(value) => setAssigneeId(value || null)}
+				>
+					<SelectTrigger className="w-[200px] min-w-[200px]">
+						<SelectValue
+							placeholder={t("common.filters.assignee.placeholder")}
+						/>
+					</SelectTrigger>
+					<SelectContent>
+						{users.map((user) => (
+							<SelectItem key={user.id} value={user.id}>
+								{user.name}
+							</SelectItem>
+						))}
+					</SelectContent>
+				</Select>
+
+				{hasFilters && (
+					<Button
+						variant="ghost"
+						size="sm"
+						onClick={handleReset}
+						disabled={isPending}
+					>
+						<X className="h-4 w-4 mr-2" />
+						{t("common.actions.clear")}
+					</Button>
+				)}
+
+				<Button onClick={() => setOpen("true")} variant="action">
+					<Plus className="h-4 w-4" />
+					{t("common.actions.addNew")}
+				</Button>
+			</div>
+
+			<CreateRiskSheet assignees={users} />
+		</div>
+	);
 }
diff --git a/apps/app/src/components/tables/risk-register/server-columns.tsx b/apps/app/src/components/tables/risk-register/server-columns.tsx
index fe0e13ac6d..3098f74c8c 100644
--- a/apps/app/src/components/tables/risk-register/server-columns.tsx
+++ b/apps/app/src/components/tables/risk-register/server-columns.tsx
@@ -1,12 +1,12 @@
 import { getI18n } from "@/locales/server";
 
 export async function getServerColumnHeaders() {
-  const t = await getI18n();
+	const t = await getI18n();
 
-  return {
-    title: t("risk.register.table.risk"),
-    status: t("common.table.status"),
-    department: t("common.filters.department"),
-    ownerId: t("common.table.assigned_to"),
-  };
+	return {
+		title: t("risk.register.table.risk"),
+		status: t("common.table.status"),
+		department: t("common.filters.department"),
+		assigneeId: t("common.assignee.label"),
+	};
 }
diff --git a/apps/app/src/components/tables/risk-tasks/data-table-header.tsx b/apps/app/src/components/tables/risk-tasks/data-table-header.tsx
index 2048a3711a..241a334372 100644
--- a/apps/app/src/components/tables/risk-tasks/data-table-header.tsx
+++ b/apps/app/src/components/tables/risk-tasks/data-table-header.tsx
@@ -107,18 +107,18 @@ export function DataTableHeader({ table, loading }: Props) {
 					</TableHead>
 				)}
 
-				{isVisible("ownerId") && (
+				{isVisible("assigneeId") && (
 					<TableHead className="min-w-[120px] px-3 md:px-4 py-2 hidden sm:table-cell">
 						<Button
 							className="p-0 hover:bg-transparent space-x-2"
 							variant="ghost"
-							onClick={() => createSortQuery("ownerId")}
+							onClick={() => createSortQuery("assigneeId")}
 						>
 							<span>{t("common.table.assigned_to")}</span>
-							{"ownerId" === column && value === "asc" && (
+							{"assigneeId" === column && value === "asc" && (
 								<ArrowDown size={16} />
 							)}
-							{"ownerId" === column && value === "desc" && (
+							{"assigneeId" === column && value === "desc" && (
 								<ArrowUp size={16} />
 							)}
 						</Button>
diff --git a/apps/app/src/components/tables/risk-tasks/data-table.tsx b/apps/app/src/components/tables/risk-tasks/data-table.tsx
index be3e1867d2..eca6eb0550 100644
--- a/apps/app/src/components/tables/risk-tasks/data-table.tsx
+++ b/apps/app/src/components/tables/risk-tasks/data-table.tsx
@@ -19,7 +19,7 @@ interface DataTableProps<TData, TValue> {
 	columnHeaders: {
 		title: string;
 		status: string;
-		ownerId: string;
+		assigneeId: string;
 	};
 	data: TData[];
 	pageCount: number;
@@ -64,7 +64,8 @@ export function DataTable<TData, TValue>({
 										<TableCell
 											key={cell.id}
 											className={cn(
-												cell.column.id === "ownerId" && "hidden sm:table-cell",
+												cell.column.id === "assigneeId" &&
+													"hidden sm:table-cell",
 												cell.column.id === "dueDate" && "hidden sm:table-cell",
 											)}
 										>
diff --git a/apps/app/src/components/tables/risk-tasks/filter-toolbar.tsx b/apps/app/src/components/tables/risk-tasks/filter-toolbar.tsx
index 84a1af3f05..e5eb89d54d 100644
--- a/apps/app/src/components/tables/risk-tasks/filter-toolbar.tsx
+++ b/apps/app/src/components/tables/risk-tasks/filter-toolbar.tsx
@@ -37,7 +37,7 @@ export function FilterToolbar({ isEmpty, assignees }: Props) {
 		parse: (value) => value || null,
 	});
 
-	const [ownerId, setOwnerId] = useQueryState("ownerId", {
+	const [assigneeId, setAssigneeId] = useQueryState("assigneeId", {
 		shallow: false,
 		history: "push",
 		parse: (value) => value || null,
diff --git a/apps/app/src/components/tables/risk-tasks/server-columns.tsx b/apps/app/src/components/tables/risk-tasks/server-columns.tsx
index 71b9cbde85..b4c8d5ed2c 100644
--- a/apps/app/src/components/tables/risk-tasks/server-columns.tsx
+++ b/apps/app/src/components/tables/risk-tasks/server-columns.tsx
@@ -1,11 +1,11 @@
 import { getI18n } from "@/locales/server";
 
 export async function getServerColumnHeaders() {
-  const t = await getI18n();
+	const t = await getI18n();
 
-  return {
-    title: t("risk.tasks.title"),
-    status: t("common.table.status"),
-    ownerId: t("common.table.assigned_to"),
-  };
+	return {
+		title: t("risk.tasks.title"),
+		status: t("common.table.status"),
+		assigneeId: t("common.assignee.label"),
+	};
 }
diff --git a/apps/app/src/data/tools/risks.ts b/apps/app/src/data/tools/risks.ts
index e73216db89..e6ee278a57 100644
--- a/apps/app/src/data/tools/risks.ts
+++ b/apps/app/src/data/tools/risks.ts
@@ -6,90 +6,90 @@ import { headers } from "next/headers";
 import { z } from "zod";
 
 export function getRiskTools() {
-	return {
-		getRisks,
-		getRiskById,
-	};
+  return {
+    getRisks,
+    getRiskById,
+  };
 }
 
 export const getRisks = tool({
-	description: "Get risks for the organization",
-	parameters: z.object({
-		status: z
-			.enum(Object.values(RiskStatus) as [RiskStatus, ...RiskStatus[]])
-			.optional(),
-		department: z
-			.enum(Object.values(Departments) as [Departments, ...Departments[]])
-			.optional(),
-		category: z
-			.enum(Object.values(RiskCategory) as [RiskCategory, ...RiskCategory[]])
-			.optional(),
-		owner: z.string().optional(),
-	}),
-	execute: async ({ status, department, category, owner }) => {
-		const session = await auth.api.getSession({
-			headers: await headers(),
-		});
+  description: "Get risks for the organization",
+  parameters: z.object({
+    status: z
+      .enum(Object.values(RiskStatus) as [RiskStatus, ...RiskStatus[]])
+      .optional(),
+    department: z
+      .enum(Object.values(Departments) as [Departments, ...Departments[]])
+      .optional(),
+    category: z
+      .enum(Object.values(RiskCategory) as [RiskCategory, ...RiskCategory[]])
+      .optional(),
+    assigneeId: z.string().optional(),
+  }),
+  execute: async ({ status, department, category, assigneeId }) => {
+    const session = await auth.api.getSession({
+      headers: await headers(),
+    });
 
-		if (!session?.session.activeOrganizationId) {
-			return { error: "Unauthorized" };
-		}
+    if (!session?.session.activeOrganizationId) {
+      return { error: "Unauthorized" };
+    }
 
-		const risks = await db.risk.findMany({
-			where: {
-				organizationId: session.session.activeOrganizationId,
-				status,
-				department,
-				category,
-				assigneeId: owner,
-			},
-			select: {
-				id: true,
-				title: true,
-				status: true,
-			},
-		});
+    const risks = await db.risk.findMany({
+      where: {
+        organizationId: session.session.activeOrganizationId,
+        status,
+        department,
+        category,
+        assigneeId,
+      },
+      select: {
+        id: true,
+        title: true,
+        status: true,
+      },
+    });
 
-		if (risks.length === 0) {
-			return {
-				risks: [],
-				message: "No risks found",
-			};
-		}
+    if (risks.length === 0) {
+      return {
+        risks: [],
+        message: "No risks found",
+      };
+    }
 
-		return {
-			risks,
-		};
-	},
+    return {
+      risks,
+    };
+  },
 });
 
 export const getRiskById = tool({
-	description: "Get a risk by id",
-	parameters: z.object({
-		id: z.string(),
-	}),
-	execute: async ({ id }) => {
-		const session = await auth.api.getSession({
-			headers: await headers(),
-		});
+  description: "Get a risk by id",
+  parameters: z.object({
+    id: z.string(),
+  }),
+  execute: async ({ id }) => {
+    const session = await auth.api.getSession({
+      headers: await headers(),
+    });
 
-		if (!session?.session.activeOrganizationId) {
-			return { error: "Unauthorized" };
-		}
+    if (!session?.session.activeOrganizationId) {
+      return { error: "Unauthorized" };
+    }
 
-		const risk = await db.risk.findUnique({
-			where: { id, organizationId: session.session.activeOrganizationId },
-		});
+    const risk = await db.risk.findUnique({
+      where: { id, organizationId: session.session.activeOrganizationId },
+    });
 
-		if (!risk) {
-			return {
-				risk: null,
-				message: "Risk not found",
-			};
-		}
+    if (!risk) {
+      return {
+        risk: null,
+        message: "Risk not found",
+      };
+    }
 
-		return {
-			risk,
-		};
-	},
+    return {
+      risk,
+    };
+  },
 });
diff --git a/apps/app/src/locales/core/common.ts b/apps/app/src/locales/core/common.ts
index b6a4aa6695..fe4962b49a 100644
--- a/apps/app/src/locales/core/common.ts
+++ b/apps/app/src/locales/core/common.ts
@@ -63,7 +63,7 @@ export const common = {
     search: "Search...",
     status: "Status",
     department: "Department",
-    owner: {
+    assignee: {
       label: "Assignee",
       placeholder: "Filter by assignee",
     },
diff --git a/packages/db/prisma/migrations/20250403205655_vendor_assignee/migration.sql b/packages/db/prisma/migrations/20250403205655_vendor_assignee/migration.sql
new file mode 100644
index 0000000000..71677248a5
--- /dev/null
+++ b/packages/db/prisma/migrations/20250403205655_vendor_assignee/migration.sql
@@ -0,0 +1,22 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `ownerId` on the `Vendor` table. All the data in the column will be lost.
+  - Added the required column `assigneeId` to the `Vendor` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- DropForeignKey
+ALTER TABLE "Vendor" DROP CONSTRAINT "Vendor_ownerId_fkey";
+
+-- DropIndex
+DROP INDEX "Vendor_ownerId_idx";
+
+-- AlterTable
+ALTER TABLE "Vendor" DROP COLUMN "ownerId",
+ADD COLUMN     "assigneeId" TEXT NOT NULL;
+
+-- CreateIndex
+CREATE INDEX "Vendor_assigneeId_idx" ON "Vendor"("assigneeId");
+
+-- AddForeignKey
+ALTER TABLE "Vendor" ADD CONSTRAINT "Vendor_assigneeId_fkey" FOREIGN KEY ("assigneeId") REFERENCES "Member"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/packages/db/prisma/migrations/20250403205840_oops_optional/migration.sql b/packages/db/prisma/migrations/20250403205840_oops_optional/migration.sql
new file mode 100644
index 0000000000..86f9d3d6c4
--- /dev/null
+++ b/packages/db/prisma/migrations/20250403205840_oops_optional/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Vendor" ALTER COLUMN "assigneeId" DROP NOT NULL;
diff --git a/packages/db/prisma/migrations/20250403210049_task_assignee_optional_too/migration.sql b/packages/db/prisma/migrations/20250403210049_task_assignee_optional_too/migration.sql
new file mode 100644
index 0000000000..a6060a166e
--- /dev/null
+++ b/packages/db/prisma/migrations/20250403210049_task_assignee_optional_too/migration.sql
@@ -0,0 +1,8 @@
+-- DropForeignKey
+ALTER TABLE "Task" DROP CONSTRAINT "Task_assigneeId_fkey";
+
+-- AlterTable
+ALTER TABLE "Task" ALTER COLUMN "assigneeId" DROP NOT NULL;
+
+-- AddForeignKey
+ALTER TABLE "Task" ADD CONSTRAINT "Task_assigneeId_fkey" FOREIGN KEY ("assigneeId") REFERENCES "Member"("id") ON DELETE SET NULL ON UPDATE CASCADE;
diff --git a/packages/db/prisma/schema/auth.prisma b/packages/db/prisma/schema/auth.prisma
index 0c3753ab5b..736e75478a 100644
--- a/packages/db/prisma/schema/auth.prisma
+++ b/packages/db/prisma/schema/auth.prisma
@@ -14,7 +14,6 @@ model User {
     invitations        Invitation[]
     members            Member[]
     sessions           Session[]
-    vendor             Vendor[]
 
     @@unique([email])
 }
@@ -88,6 +87,7 @@ model Member {
     Policy                          Policy[]
     Risk                            Risk[]
     Task                            Task[]
+    Vendor                          Vendor[]
 }
 
 model Invitation {
diff --git a/packages/db/prisma/schema/task.prisma b/packages/db/prisma/schema/task.prisma
index e2d765e5fe..a117f7e9cf 100644
--- a/packages/db/prisma/schema/task.prisma
+++ b/packages/db/prisma/schema/task.prisma
@@ -13,8 +13,8 @@ model Task {
     dueDate   DateTime
 
     // Relationships
-    assigneeId     String
-    assignee       Member       @relation(fields: [assigneeId], references: [id])
+    assigneeId     String?
+    assignee       Member?      @relation(fields: [assigneeId], references: [id])
     organizationId String
     organization   Organization @relation(fields: [organizationId], references: [id])
 
diff --git a/packages/db/prisma/schema/vendor.prisma b/packages/db/prisma/schema/vendor.prisma
index 4c8dc04f92..2e8c81be43 100644
--- a/packages/db/prisma/schema/vendor.prisma
+++ b/packages/db/prisma/schema/vendor.prisma
@@ -8,16 +8,18 @@ model Vendor {
   inherentImpact      Impact          @default(insignificant)
   residualProbability Likelihood      @default(very_unlikely)
   residualImpact      Impact          @default(insignificant)
-  createdAt           DateTime        @default(now())
-  updatedAt           DateTime        @updatedAt
-  organizationId      String
-  ownerId             String?
-  organization        Organization    @relation(fields: [organizationId], references: [id], onDelete: Cascade)
-  owner               User?           @relation(fields: [ownerId], references: [id])
   contacts            VendorContact[]
 
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  organizationId String
+  organization   Organization @relation(fields: [organizationId], references: [id], onDelete: Cascade)
+  assigneeId     String?
+  assignee       Member?      @relation(fields: [assigneeId], references: [id], onDelete: Cascade)
+
   @@index([organizationId])
-  @@index([ownerId])
+  @@index([assigneeId])
   @@index([category])
 }
 
diff --git a/packages/docs/api-reference/v1/risks.mdx b/packages/docs/api-reference/v1/risks.mdx
index 6a90ecf26e..a938f47f85 100644
--- a/packages/docs/api-reference/v1/risks.mdx
+++ b/packages/docs/api-reference/v1/risks.mdx
@@ -65,11 +65,13 @@ Get all risks for the organization associated with the API key.
       "residual_impact": 5,
       "createdAt": "2023-01-15T12:00:00.000Z",
       "updatedAt": "2023-01-16T09:30:00.000Z",
-      "ownerId": "u123abc456",
-      "owner": {
+      "assigneeId": "u123abc456",
+      "assignee": {
         "id": "u123abc456",
-        "name": "John Doe",
-        "email": "john.doe@example.com"
+        "user": {
+          "name": "John Doe",
+          "email": "john.doe@example.com"
+        }
       }
     }
     // More risks...
@@ -134,7 +136,7 @@ Create a new risk for the organization associated with the API key.
 | impact               | number | The initial impact score (0-10). Default: 0                              | No       |
 | residual_probability | number | The residual probability score after mitigation (0-10). Default: 0       | No       |
 | residual_impact      | number | The residual impact score after mitigation (0-10). Default: 0            | No       |
-| ownerId              | string | The ID of the user who owns the risk                                     | No       |
+| assigneeId           | string | The ID of the user who owns the risk                                     | No       |
 
 #### Example Request
 
@@ -167,7 +169,7 @@ Create a new risk for the organization associated with the API key.
     "residual_impact": 0,
     "createdAt": "2023-01-15T12:00:00.000Z",
     "updatedAt": "2023-01-15T12:00:00.000Z",
-    "ownerId": null,
+    "assigneeId": null,
     "organizationId": "org123abc456"
   }
 }
@@ -242,11 +244,13 @@ Get a single risk by ID for the organization associated with the API key.
     "residual_impact": 5,
     "createdAt": "2023-01-15T12:00:00.000Z",
     "updatedAt": "2023-01-16T09:30:00.000Z",
-    "ownerId": "u123abc456",
-    "owner": {
+    "assigneeId": "u123abc456",
+    "assignee": {
       "id": "u123abc456",
-      "name": "John Doe",
-      "email": "john.doe@example.com"
+      "user": {
+        "name": "John Doe",
+        "email": "john.doe@example.com"
+      }
     },
     "treatmentStrategy": {
       "id": "trt123abc456",
@@ -265,7 +269,7 @@ Get a single risk by ID for the organization associated with the API key.
         "completedAt": null,
         "createdAt": "2023-01-15T14:10:00.000Z",
         "updatedAt": "2023-01-15T14:10:00.000Z",
-        "ownerId": "u123abc456"
+        "assigneeId": "u123abc456"
       },
       {
         "id": "tsk789xyz123",
@@ -276,7 +280,7 @@ Get a single risk by ID for the organization associated with the API key.
         "completedAt": null,
         "createdAt": "2023-01-15T14:15:00.000Z",
         "updatedAt": "2023-01-15T14:15:00.000Z",
-        "ownerId": "u123abc456"
+        "assigneeId": "u123abc456"
       }
     ]
   }