diff --git a/apps/web/__tests__/unit/desktop-video-create.test.ts b/apps/web/__tests__/unit/desktop-video-create.test.ts
index 26b31674319..5ead2bc89a4 100644
--- a/apps/web/__tests__/unit/desktop-video-create.test.ts
+++ b/apps/web/__tests__/unit/desktop-video-create.test.ts
@@ -64,6 +64,7 @@ vi.mock("@cap/web-backend", () => ({
 		getOrganizationWritableAccess: vi.fn(),
 		getS3WritableAccessForUser: vi.fn(),
 	},
+	resolveNewVideoDefaults: vi.fn(),
 }));
 
 vi.mock("@/lib/server", () => ({
@@ -92,7 +93,7 @@ vi.mock("drizzle-orm", () => ({
 }));
 
 const mockGetCurrentUser = getCurrentUser as ReturnType<typeof vi.fn>;
-const { Storage } = await import("@cap/web-backend");
+const { Storage, resolveNewVideoDefaults } = await import("@cap/web-backend");
 
 const effectLike = <T>(value: T) => ({
 	pipe: (fn: (value: T) => unknown) => fn(value),
@@ -140,6 +141,10 @@ function stubStorage() {
 			storageIntegrationId: Option.none(),
 		}),
 	);
+	(resolveNewVideoDefaults as ReturnType<typeof vi.fn>).mockResolvedValue({
+		public: true,
+		password: null,
+	});
 }
 
 describe("GET /create", () => {
@@ -226,6 +231,36 @@ describe("GET /create", () => {
 		});
 	});
 
+	it("applies the org's sharing defaults to the created video", async () => {
+		mockGetCurrentUser.mockResolvedValue({
+			id: "user-1",
+			email: "someone@cap.test",
+			defaultOrgId: "org-1",
+			activeOrganizationId: "org-1",
+		});
+		mockDb.where
+			.mockResolvedValueOnce([
+				{ id: "org-1", name: "Acme", createdAt: new Date() },
+			])
+			.mockResolvedValueOnce([])
+			.mockResolvedValueOnce([{ count: 5 }]);
+		(resolveNewVideoDefaults as ReturnType<typeof vi.fn>).mockResolvedValue({
+			public: false,
+			password: "org-default-hash",
+		});
+
+		const response = await app.request("https://cap.test/create");
+
+		expect(response.status).toBe(200);
+		expect(resolveNewVideoDefaults).toHaveBeenCalledWith(mockDb, "org-1");
+		expect(insertedValues(schema.videos)).toMatchObject({
+			orgId: "org-1",
+			ownerId: "user-1",
+			public: false,
+			password: "org-default-hash",
+		});
+	});
+
 	it("heals a dangling defaultOrgId when the user has no remaining orgs", async () => {
 		mockGetCurrentUser.mockResolvedValue({
 			id: "user-1",
@@ -340,5 +375,6 @@ describe("GET /create", () => {
 			orgId: "org-2",
 			ownerId: "user-1",
 		});
+		expect(resolveNewVideoDefaults).toHaveBeenCalledWith(mockDb, "org-2");
 	});
 });
diff --git a/apps/web/__tests__/unit/loom-import.test.ts b/apps/web/__tests__/unit/loom-import.test.ts
index 765347c06a1..cf688a5e3d0 100644
--- a/apps/web/__tests__/unit/loom-import.test.ts
+++ b/apps/web/__tests__/unit/loom-import.test.ts
@@ -6,6 +6,7 @@ const valuesMock = vi.fn();
 const startMock = vi.fn();
 const revalidatePathMock = vi.fn();
 const storageGetWritableAccessForUserMock = vi.hoisted(() => vi.fn());
+const resolveNewVideoDefaultsMock = vi.hoisted(() => vi.fn());
 const checkRateLimitMock = vi.hoisted(() => vi.fn());
 const headersMock = vi.hoisted(() => vi.fn());
 const getOrganizationAccessMock = vi.hoisted(() => vi.fn());
@@ -125,6 +126,7 @@ vi.mock("@cap/web-backend", () => ({
 	Storage: {
 		getWritableAccessForUser: storageGetWritableAccessForUserMock,
 	},
+	resolveNewVideoDefaults: resolveNewVideoDefaultsMock,
 }));
 
 vi.mock("@cap/web-domain", () => ({
@@ -230,6 +232,10 @@ describe("importFromLoom", () => {
 				storageIntegrationId: Option.none(),
 			}),
 		);
+		resolveNewVideoDefaultsMock.mockResolvedValue({
+			public: true,
+			password: null,
+		});
 		mockGetCurrentUser.mockResolvedValue({
 			id: "user-123",
 		});
@@ -482,6 +488,69 @@ describe("importFromLoom", () => {
 		expect(revalidatePathMock).toHaveBeenCalledWith("/dashboard/caps");
 	});
 
+	it("applies the org's sharing defaults to the imported video", async () => {
+		whereMock.mockResolvedValueOnce([]).mockResolvedValueOnce(undefined);
+
+		resolveNewVideoDefaultsMock.mockResolvedValue({
+			public: false,
+			password: "org-default-hash",
+		});
+
+		const fetchMock = vi.mocked(fetch);
+		fetchMock.mockImplementation(async (input) => {
+			const url = typeof input === "string" ? input : input.toString();
+
+			if (url.includes("/transcoded-url")) {
+				return {
+					ok: true,
+					status: 200,
+					text: async () =>
+						JSON.stringify({ url: "https://cdn.loom.com/video.mp4" }),
+				} as Response;
+			}
+
+			if (url === "https://www.loom.com/graphql") {
+				return {
+					ok: true,
+					json: async () => ({
+						data: { getVideo: { name: "Imported video" } },
+					}),
+				} as Response;
+			}
+
+			if (url.includes("/v1/oembed")) {
+				return {
+					ok: true,
+					json: async () => ({ duration: 42, width: 1920, height: 1080 }),
+				} as Response;
+			}
+
+			throw new Error(`Unexpected fetch: ${url}`);
+		});
+
+		const { importFromLoom } = await import("@/actions/loom");
+
+		const result = await importFromLoom({
+			loomUrl: "https://www.loom.com/share/loom-abc1234567",
+			orgId: "org-1" as never,
+		});
+
+		expect(result).toEqual({
+			success: true,
+			videoId: "video-123",
+		});
+		expect(resolveNewVideoDefaultsMock).toHaveBeenCalledWith(
+			expect.anything(),
+			"org-1",
+		);
+		expect(valuesMock).toHaveBeenCalledWith(
+			expect.objectContaining({
+				public: false,
+				password: "org-default-hash",
+			}),
+		);
+	});
+
 	it("rejects a CSV import when the current user is not an organization admin or owner", async () => {
 		getOrganizationAccessMock.mockResolvedValueOnce({
 			id: "org-1",
diff --git a/apps/web/__tests__/unit/new-video-defaults.test.ts b/apps/web/__tests__/unit/new-video-defaults.test.ts
new file mode 100644
index 00000000000..ebc4ab8a368
--- /dev/null
+++ b/apps/web/__tests__/unit/new-video-defaults.test.ts
@@ -0,0 +1,64 @@
+import { type DbClient, resolveNewVideoDefaults } from "@cap/web-backend";
+import type { Organisation } from "@cap/web-domain";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const env = vi.hoisted(() => ({ defaultPublic: true }));
+
+vi.mock("@cap/env", async (importOriginal) => ({
+	...(await importOriginal<typeof import("@cap/env")>()),
+	serverEnv: () => ({ CAP_VIDEOS_DEFAULT_PUBLIC: env.defaultPublic }),
+}));
+
+type OrganizationRow = {
+	settings: { defaultVideoPublic?: boolean } | null;
+	defaultVideoPassword: string | null;
+};
+
+const dbReturning = (rows: OrganizationRow[]) =>
+	({
+		select: () => ({ from: () => ({ where: async () => rows }) }),
+	}) as unknown as DbClient;
+
+const orgId = "org-1" as Organisation.OrganisationId;
+
+describe("resolveNewVideoDefaults", () => {
+	beforeEach(() => {
+		env.defaultPublic = true;
+	});
+
+	it("falls back to the env default when the organization row is missing", async () => {
+		expect(await resolveNewVideoDefaults(dbReturning([]), orgId)).toEqual({
+			public: true,
+			password: null,
+		});
+
+		env.defaultPublic = false;
+
+		expect(await resolveNewVideoDefaults(dbReturning([]), orgId)).toEqual({
+			public: false,
+			password: null,
+		});
+	});
+
+	it("prefers the organization setting over the env default", async () => {
+		const db = dbReturning([
+			{ settings: { defaultVideoPublic: false }, defaultVideoPassword: null },
+		]);
+
+		expect(await resolveNewVideoDefaults(db, orgId)).toEqual({
+			public: false,
+			password: null,
+		});
+	});
+
+	it("passes the stored password hash through", async () => {
+		const db = dbReturning([
+			{ settings: null, defaultVideoPassword: "hashed-password" },
+		]);
+
+		expect(await resolveNewVideoDefaults(db, orgId)).toEqual({
+			public: true,
+			password: "hashed-password",
+		});
+	});
+});
diff --git a/apps/web/actions/loom.ts b/apps/web/actions/loom.ts
index 75f3672a2ae..7ab783dbd63 100644
--- a/apps/web/actions/loom.ts
+++ b/apps/web/actions/loom.ts
@@ -16,7 +16,7 @@ import {
 } from "@cap/database/schema";
 import { buildEnv, NODE_ENV, serverEnv } from "@cap/env";
 import { dub, userIsPro } from "@cap/utils";
-import { Storage } from "@cap/web-backend";
+import { resolveNewVideoDefaults, Storage } from "@cap/web-backend";
 import {
 	type Organisation,
 	Space,
@@ -387,6 +387,8 @@ async function importLoomVideoForOwner({
 		videoName ||
 		`Loom Import - ${new Date().toLocaleDateString("en-US", { day: "numeric", month: "long", year: "numeric" })}`;
 
+	const videoDefaults = await resolveNewVideoDefaults(db(), orgId);
+
 	await db()
 		.insert(videos)
 		.values({
@@ -397,7 +399,8 @@ async function importLoomVideoForOwner({
 			source: { type: "webMP4" as const },
 			bucket: Option.getOrNull(writable.bucketId),
 			storageIntegrationId: Option.getOrNull(writable.storageIntegrationId),
-			public: serverEnv().CAP_VIDEOS_DEFAULT_PUBLIC,
+			public: videoDefaults.public,
+			password: videoDefaults.password,
 			...(oembedMeta?.duration ? { duration: oembedMeta.duration } : {}),
 			...(oembedMeta?.width ? { width: oembedMeta.width } : {}),
 			...(oembedMeta?.height ? { height: oembedMeta.height } : {}),
diff --git a/apps/web/actions/organization/default-video-password.ts b/apps/web/actions/organization/default-video-password.ts
new file mode 100644
index 00000000000..c6aeca45961
--- /dev/null
+++ b/apps/web/actions/organization/default-video-password.ts
@@ -0,0 +1,71 @@
+"use server";
+
+import { db } from "@cap/database";
+import { getCurrentUser } from "@cap/database/auth/session";
+import { hashPassword } from "@cap/database/crypto";
+import { organizations } from "@cap/database/schema";
+import { eq } from "drizzle-orm";
+import { revalidatePath } from "next/cache";
+import { requireOrganizationSettingsManager } from "./authorization";
+
+function revalidateOrganizationSettingsPaths() {
+	revalidatePath("/dashboard/caps");
+	revalidatePath("/dashboard/settings/organization");
+	revalidatePath("/dashboard/settings/organization/preferences");
+}
+
+export async function setOrganizationDefaultVideoPassword(password: string) {
+	try {
+		const user = await getCurrentUser();
+
+		if (!user?.activeOrganizationId) throw new Error("Unauthorized");
+
+		if (typeof password !== "string" || password.trim().length === 0)
+			throw new Error("Password is required");
+
+		if (password.length > 255) throw new Error("Password is too long");
+
+		await requireOrganizationSettingsManager(
+			user.id,
+			user.activeOrganizationId,
+		);
+
+		const hashed = await hashPassword(password);
+		await db()
+			.update(organizations)
+			.set({ defaultVideoPassword: hashed })
+			.where(eq(organizations.id, user.activeOrganizationId));
+
+		revalidateOrganizationSettingsPaths();
+
+		return { success: true, value: "Default password updated successfully" };
+	} catch (error) {
+		console.error("Error setting organization default video password:", error);
+		return { success: false, error: "Failed to update default password" };
+	}
+}
+
+export async function removeOrganizationDefaultVideoPassword() {
+	try {
+		const user = await getCurrentUser();
+
+		if (!user?.activeOrganizationId) throw new Error("Unauthorized");
+
+		await requireOrganizationSettingsManager(
+			user.id,
+			user.activeOrganizationId,
+		);
+
+		await db()
+			.update(organizations)
+			.set({ defaultVideoPassword: null })
+			.where(eq(organizations.id, user.activeOrganizationId));
+
+		revalidateOrganizationSettingsPaths();
+
+		return { success: true, value: "Default password removed successfully" };
+	} catch (error) {
+		console.error("Error removing organization default video password:", error);
+		return { success: false, error: "Failed to remove default password" };
+	}
+}
diff --git a/apps/web/actions/organization/settings.ts b/apps/web/actions/organization/settings.ts
index 1d8abe0aab7..64af8b69b35 100644
--- a/apps/web/actions/organization/settings.ts
+++ b/apps/web/actions/organization/settings.ts
@@ -25,6 +25,7 @@ type OrganizationSettingsInput = {
 	shareableLinkUseOrganizationIcon?: boolean;
 	aiGenerationLanguage?: AiGenerationLanguage;
 	defaultPlaybackSpeed?: number;
+	defaultVideoPublic?: boolean;
 };
 
 const proOrganizationSettingKeys = [
diff --git a/apps/web/actions/video/create-for-processing.ts b/apps/web/actions/video/create-for-processing.ts
index a3acda737b4..1267c6a3116 100644
--- a/apps/web/actions/video/create-for-processing.ts
+++ b/apps/web/actions/video/create-for-processing.ts
@@ -4,9 +4,11 @@ import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
 import { nanoId } from "@cap/database/helpers";
 import { videos, videoUploads } from "@cap/database/schema";
-import { serverEnv } from "@cap/env";
 import { userIsPro } from "@cap/utils";
-import { Storage as StorageService } from "@cap/web-backend";
+import {
+	resolveNewVideoDefaults,
+	Storage as StorageService,
+} from "@cap/web-backend";
 import {
 	type Folder,
 	type Organisation,
@@ -86,6 +88,8 @@ export async function createVideoForServerProcessing({
 		orgId,
 	).pipe(runPromise);
 
+	const videoDefaults = await resolveNewVideoDefaults(db(), orgId);
+
 	await db()
 		.insert(videos)
 		.values({
@@ -96,7 +100,8 @@ export async function createVideoForServerProcessing({
 			source: { type: "webMP4" as const },
 			bucket: Option.getOrNull(uploadResult.bucketId),
 			storageIntegrationId: Option.getOrNull(uploadResult.storageIntegrationId),
-			public: serverEnv().CAP_VIDEOS_DEFAULT_PUBLIC,
+			public: videoDefaults.public,
+			password: videoDefaults.password,
 			...(folderId ? { folderId } : {}),
 		});
 
diff --git a/apps/web/actions/video/upload.ts b/apps/web/actions/video/upload.ts
index 43fe9d1fa74..dfe09ad7e25 100644
--- a/apps/web/actions/video/upload.ts
+++ b/apps/web/actions/video/upload.ts
@@ -4,9 +4,11 @@ import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
 import { nanoId } from "@cap/database/helpers";
 import { videos, videoUploads } from "@cap/database/schema";
-import { serverEnv } from "@cap/env";
 import { userIsPro } from "@cap/utils";
-import { Storage as StorageService } from "@cap/web-backend";
+import {
+	resolveNewVideoDefaults,
+	Storage as StorageService,
+} from "@cap/web-backend";
 import {
 	type Folder,
 	type Organisation,
@@ -212,6 +214,8 @@ export async function createVideoAndGetUploadUrl({
 				organizationId: orgId,
 			});
 
+		const videoDefaults = await resolveNewVideoDefaults(db(), orgId);
+
 		const videoData = {
 			id: idToUse,
 			name: `Cap ${
@@ -223,7 +227,8 @@ export async function createVideoAndGetUploadUrl({
 			isScreenshot,
 			bucket: Option.getOrNull(bucketId),
 			storageIntegrationId: Option.getOrNull(storageIntegrationId),
-			public: serverEnv().CAP_VIDEOS_DEFAULT_PUBLIC,
+			public: videoDefaults.public,
+			password: videoDefaults.password,
 			...(folderId ? { folderId } : {}),
 		};
 
diff --git a/apps/web/app/(org)/dashboard/Contexts.tsx b/apps/web/app/(org)/dashboard/Contexts.tsx
index 40f5ac3b06a..90459a271cb 100644
--- a/apps/web/app/(org)/dashboard/Contexts.tsx
+++ b/apps/web/app/(org)/dashboard/Contexts.tsx
@@ -29,6 +29,7 @@ export function DashboardContexts({
 	spacesData,
 	userCapsCount,
 	organizationSettings,
+	instanceVideoDefaultPublic,
 	userPreferences,
 	anyNewNotifications,
 	initialTheme,
@@ -41,6 +42,7 @@ export function DashboardContexts({
 	spacesData: SharedContext["spacesData"];
 	userCapsCount: SharedContext["userCapsCount"];
 	organizationSettings: SharedContext["organizationSettings"];
+	instanceVideoDefaultPublic: SharedContext["instanceVideoDefaultPublic"];
 	userPreferences: SharedContext["userPreferences"];
 	anyNewNotifications: boolean;
 	initialTheme: ITheme;
@@ -149,6 +151,7 @@ export function DashboardContexts({
 					anyNewNotifications,
 					userPreferences,
 					organizationSettings,
+					instanceVideoDefaultPublic,
 					userSpaces,
 					sharedSpaces,
 					activeSpace,
diff --git a/apps/web/app/(org)/dashboard/DashboardContext.ts b/apps/web/app/(org)/dashboard/DashboardContext.ts
index b4c0e6e7a33..9845baf1a7c 100644
--- a/apps/web/app/(org)/dashboard/DashboardContext.ts
+++ b/apps/web/app/(org)/dashboard/DashboardContext.ts
@@ -21,6 +21,7 @@ export type SharedContext = {
 	organizationData: Organization[] | null;
 	activeOrganization: Organization | null;
 	organizationSettings: OrganizationSettings | null;
+	instanceVideoDefaultPublic: boolean;
 	spacesData: Spaces[] | null;
 	userSpaces: Spaces[] | null;
 	sharedSpaces: Spaces[] | null;
diff --git a/apps/web/app/(org)/dashboard/_components/Navbar/Top.tsx b/apps/web/app/(org)/dashboard/_components/Navbar/Top.tsx
index dab863e629a..a9e57fa4a33 100644
--- a/apps/web/app/(org)/dashboard/_components/Navbar/Top.tsx
+++ b/apps/web/app/(org)/dashboard/_components/Navbar/Top.tsx
@@ -68,6 +68,8 @@ const Top = () => {
 		"/dashboard/settings/organization/content": "Organization Settings",
 		"/dashboard/settings/organization/billing": "Organization Settings",
 		"/dashboard/settings/organization/members": "Organization Settings",
+		"/dashboard/settings/organization/integrations": "Organization Settings",
+		"/dashboard/settings/organization/security": "Organization Settings",
 		"/dashboard/settings/account": "Account Settings",
 		"/dashboard/settings/notifications": "Notification Settings",
 		"/dashboard/spaces": "Spaces",
diff --git a/apps/web/app/(org)/dashboard/dashboard-data.ts b/apps/web/app/(org)/dashboard/dashboard-data.ts
index db913c12dd1..8af374e8da6 100644
--- a/apps/web/app/(org)/dashboard/dashboard-data.ts
+++ b/apps/web/app/(org)/dashboard/dashboard-data.ts
@@ -30,10 +30,11 @@ import { selectProSeatProvider } from "@/utils/organization";
 export type Organization = {
 	organization: Omit<
 		typeof organizations.$inferSelect,
-		"iconUrl" | "shareableLinkIconUrl"
+		"iconUrl" | "shareableLinkIconUrl" | "defaultVideoPassword"
 	> & {
 		iconUrl: ImageUpload.ImageUrl | null;
 		shareableLinkIconUrl: ImageUpload.ImageUrl | null;
+		hasDefaultVideoPassword: boolean;
 	};
 	members: (typeof organizationMembers.$inferSelect & {
 		user: Pick<
@@ -427,9 +428,12 @@ export async function getDashboardData(user: typeof userSelectProps) {
 						(memberCountResult[0]?.value || 0) +
 						(inviteCountResult[0]?.value || 0);
 
+					const { defaultVideoPassword, ...clientOrganization } = organization;
+
 					return {
 						organization: {
-							...organization,
+							...clientOrganization,
+							hasDefaultVideoPassword: defaultVideoPassword !== null,
 							iconUrl: organization.iconUrl
 								? yield* iconImages.resolveImageUrl(organization.iconUrl)
 								: null,
diff --git a/apps/web/app/(org)/dashboard/layout.tsx b/apps/web/app/(org)/dashboard/layout.tsx
index dde0a568be2..b11c7a30329 100644
--- a/apps/web/app/(org)/dashboard/layout.tsx
+++ b/apps/web/app/(org)/dashboard/layout.tsx
@@ -1,6 +1,7 @@
 import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
 import { organizationInvites } from "@cap/database/schema";
+import { serverEnv } from "@cap/env";
 import { and, eq } from "drizzle-orm";
 import { cookies } from "next/headers";
 import { redirect } from "next/navigation";
@@ -96,6 +97,7 @@ export default async function DashboardLayout({
 			<UploadingProvider>
 				<DashboardContexts
 					organizationSettings={organizationSettings}
+					instanceVideoDefaultPublic={serverEnv().CAP_VIDEOS_DEFAULT_PUBLIC}
 					userCapsCount={userCapsCount}
 					organizationData={organizationSelect}
 					activeOrganization={activeOrganization || null}
diff --git a/apps/web/app/(org)/dashboard/settings/organization/GeneralPage.tsx b/apps/web/app/(org)/dashboard/settings/organization/GeneralPage.tsx
index e6eb7fc73fe..2a7eaf19f71 100644
--- a/apps/web/app/(org)/dashboard/settings/organization/GeneralPage.tsx
+++ b/apps/web/app/(org)/dashboard/settings/organization/GeneralPage.tsx
@@ -1,15 +1,38 @@
 "use client";
 
+import AccessEmailDomain from "./components/AccessEmailDomain";
+import { CustomDomain } from "./components/CustomDomain";
 import DeleteOrg from "./components/DeleteOrg";
-import { OrganizationDetailsCard } from "./components/OrganizationDetailsCard";
+import { OrganizationIcon } from "./components/OrganizationIcon";
+import OrgName from "./components/OrgName";
+import { ShareableLinkIcon } from "./components/ShareableLinkIcon";
 
 export function GeneralPage() {
 	return (
-		<div className="flex flex-col gap-6">
-			<div className="flex flex-col gap-6 justify-center items-stretch xl:flex-row">
-				<OrganizationDetailsCard />
-			</div>
-			<DeleteOrg />
+		<div className="flex flex-col w-full max-w-2xl">
+			<section>
+				<h2 className="text-sm font-medium text-gray-12">Organization</h2>
+				<div className="mt-3 rounded-xl border divide-y shadow-xs border-gray-3 divide-gray-3 bg-gray-1">
+					<OrgName />
+					<OrganizationIcon />
+					<ShareableLinkIcon />
+				</div>
+			</section>
+
+			<section className="mt-10">
+				<h2 className="text-sm font-medium text-gray-12">Access</h2>
+				<div className="mt-3 rounded-xl border divide-y shadow-xs border-gray-3 divide-gray-3 bg-gray-1">
+					<CustomDomain />
+					<AccessEmailDomain />
+				</div>
+			</section>
+
+			<section className="mt-10">
+				<h2 className="text-sm font-medium text-gray-12">Danger zone</h2>
+				<div className="mt-3 rounded-xl border divide-y shadow-xs border-gray-3 divide-gray-3 bg-gray-1">
+					<DeleteOrg />
+				</div>
+			</section>
 		</div>
 	);
 }
diff --git a/apps/web/app/(org)/dashboard/settings/organization/_components/SettingsNav.tsx b/apps/web/app/(org)/dashboard/settings/organization/_components/SettingsNav.tsx
index f346434782c..74367a40074 100644
--- a/apps/web/app/(org)/dashboard/settings/organization/_components/SettingsNav.tsx
+++ b/apps/web/app/(org)/dashboard/settings/organization/_components/SettingsNav.tsx
@@ -9,7 +9,7 @@ import { usePathname } from "next/navigation";
 export function SettingsNav() {
 	const pathname = usePathname();
 	const tabs = [
-		{ label: "General", href: "/dashboard/settings/organization" },
+		{ label: "Settings", href: "/dashboard/settings/organization" },
 		{
 			label: "Preferences",
 			href: "/dashboard/settings/organization/preferences",
diff --git a/apps/web/app/(org)/dashboard/settings/organization/components/AccessEmailDomain.tsx b/apps/web/app/(org)/dashboard/settings/organization/components/AccessEmailDomain.tsx
index d12feffd8e7..99c1c1677c2 100644
--- a/apps/web/app/(org)/dashboard/settings/organization/components/AccessEmailDomain.tsx
+++ b/apps/web/app/(org)/dashboard/settings/organization/components/AccessEmailDomain.tsx
@@ -1,10 +1,11 @@
-import { Button, Label } from "@cap/ui";
+import { Button } from "@cap/ui";
 import type { Organisation } from "@cap/web-domain";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
 import { toast } from "sonner";
 import { updateOrganizationDetails } from "@/actions/organization/update-details";
 import { useDashboardContext } from "../../../Contexts";
+import { SettingRow } from "./SettingsRows";
 
 export const AccessEmailDomain = () => {
 	const { activeOrganization } = useDashboardContext();
@@ -33,46 +34,18 @@ export const AccessEmailDomain = () => {
 	};
 
 	return (
-		<div className="flex-1 space-y-4">
-			<div className="space-y-1">
-				<Label htmlFor="allowedEmailDomain">Email access restriction</Label>
-				<p className="text-sm text-gray-10">
-					Restrict who can access public "anyone with the link" videos. Add
-					email domains (e.g.{" "}
-					<code className="text-xs bg-gray-3 px-1 py-0.5 rounded">
-						company.com
-					</code>
-					) or specific email addresses (e.g.{" "}
-					<code className="text-xs bg-gray-3 px-1 py-0.5 rounded">
-						larry@google.com
-					</code>
-					), separated by commas.
-				</p>
-				<p className="text-sm text-gray-10">
-					Members of your organization and spaces can always access videos
-					shared with them, regardless of this setting.{" "}
-					<span className="font-medium text-gray-11">
-						Leave blank to allow anyone with the link.
-					</span>
-				</p>
-			</div>
-			<div className="flex flex-col gap-3 w-full h-fit">
-				<textarea
-					className="flex px-4 py-3 w-full font-thin transition-all duration-200 text-[16px] md:text-[13px] text-gray-12 bg-gray-1 border-gray-4 outline-0 focus:bg-gray-2 rounded-xl hover:bg-gray-2 border-[1px] focus:border-gray-5 placeholder:text-gray-8 ring-0 ring-gray-2 focus:ring-1 focus:ring-gray-12 focus:ring-offset-2 ring-offset-gray-3 hover:placeholder:text-gray-12 placeholder:duration-200 min-h-[72px] resize-y"
-					placeholder="e.g. company.com, partner.org, larry@google.com"
-					value={emailDomain || ""}
-					id="allowedEmailDomain"
-					name="allowedEmailDomain"
-					onChange={(e) => {
-						setEmailDomain(e.target.value);
-					}}
-				/>
-				<div>
+		<div>
+			<SettingRow
+				label="Access email domain"
+				description={
+					'Restrict who can access public "anyone with the link" videos. Leave blank to allow anyone with the link.'
+				}
+				control={
 					<Button
 						className="min-w-fit"
 						type="submit"
 						spinner={saveLoading}
-						size="sm"
+						size="xs"
 						variant="dark"
 						disabled={
 							saveLoading ||
@@ -83,7 +56,32 @@ export const AccessEmailDomain = () => {
 					>
 						{saveLoading ? null : "Save"}
 					</Button>
-				</div>
+				}
+			/>
+			<div className="flex flex-col gap-2 px-4 pb-4">
+				<textarea
+					aria-label="Access email domain"
+					className="flex px-3 py-2 w-full font-thin transition-all duration-200 text-[16px] md:text-[13px] text-gray-12 bg-gray-1 border-gray-4 outline-0 focus:bg-gray-2 rounded-lg hover:bg-gray-2 border-[1px] focus:border-gray-5 placeholder:text-gray-8 ring-0 ring-gray-2 focus:ring-1 focus:ring-gray-12 focus:ring-offset-2 ring-offset-gray-3 hover:placeholder:text-gray-12 placeholder:duration-200 min-h-[64px] resize-y shadow-xs"
+					placeholder="e.g. company.com, partner.org, larry@google.com"
+					value={emailDomain || ""}
+					id="allowedEmailDomain"
+					name="allowedEmailDomain"
+					onChange={(e) => {
+						setEmailDomain(e.target.value);
+					}}
+				/>
+				<p className="text-[13px] text-gray-10">
+					Add email domains (e.g.{" "}
+					<code className="text-xs bg-gray-3 px-1 py-0.5 rounded">
+						company.com
+					</code>
+					) or specific email addresses (e.g.{" "}
+					<code className="text-xs bg-gray-3 px-1 py-0.5 rounded">
+						larry@google.com
+					</code>
+					), separated by commas. Members of your organization and spaces can
+					always access videos shared with them, regardless of this setting.
+				</p>
 			</div>
 		</div>
 	);
diff --git a/apps/web/app/(org)/dashboard/settings/organization/components/CapSettingsCard.tsx b/apps/web/app/(org)/dashboard/settings/organization/components/CapSettingsCard.tsx
index 897385d7e15..5d4ca0bdbac 100644
--- a/apps/web/app/(org)/dashboard/settings/organization/components/CapSettingsCard.tsx
+++ b/apps/web/app/(org)/dashboard/settings/organization/components/CapSettingsCard.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { Card, CardDescription, CardHeader, CardTitle, Switch } from "@cap/ui";
+import { Button, Input, Switch } from "@cap/ui";
 import {
 	AI_GENERATION_LANGUAGE_AUTO,
 	AI_GENERATION_LANGUAGES,
@@ -8,15 +8,20 @@ import {
 	getAiGenerationLanguageName,
 	isAiGenerationLanguage,
 } from "@cap/web-domain";
+import { useMutation } from "@tanstack/react-query";
 import { useDebounce } from "@uidotdev/usehooks";
-import clsx from "clsx";
-import { ChevronDown, Gauge, Globe } from "lucide-react";
+import { useRouter } from "next/navigation";
 import { useEffect, useRef, useState } from "react";
 import { toast } from "sonner";
+import {
+	removeOrganizationDefaultVideoPassword,
+	setOrganizationDefaultVideoPassword,
+} from "@/actions/organization/default-video-password";
 import { updateOrganizationSettings } from "@/actions/organization/settings";
 import { DEFAULT_PLAYBACK_SPEED, PLAYBACK_SPEEDS } from "@/lib/playback-speed";
 import { useDashboardContext } from "../../../Contexts";
 import type { OrganizationSettings } from "../../../dashboard-data";
+import { type SelectOption, SettingRow, SettingSelect } from "./SettingsRows";
 
 const defaultSettings: OrganizationSettings = {
 	disableComments: false,
@@ -43,42 +48,42 @@ const options: Array<{
 	pro?: boolean;
 }> = [
 	{
-		label: "Enable comments",
+		label: "Comments",
 		value: "disableComments",
-		description: "Allow viewers to comment on caps",
+		description: "Allow viewers to comment",
 	},
 	{
-		label: "Enable summary",
-		value: "disableSummary",
-		description: "Show AI-generated summary (requires transcript)",
-		pro: true,
+		label: "Reactions",
+		value: "disableReactions",
+		description: "Allow viewers to react",
 	},
 	{
-		label: "Enable captions",
-		value: "disableCaptions",
-		description: "Allow viewers to use captions for caps",
+		label: "Transcript",
+		value: "disableTranscript",
+		description: "Also required for chapters and summary",
+		pro: true,
 	},
 	{
-		label: "Enable chapters",
+		label: "Chapters",
 		value: "disableChapters",
-		description: "Show AI-generated chapters (requires transcript)",
+		description: "AI generated, requires transcript",
 		pro: true,
 	},
 	{
-		label: "Enable reactions",
-		value: "disableReactions",
-		description: "Allow viewers to react to caps",
+		label: "Summary",
+		value: "disableSummary",
+		description: "AI generated, requires transcript",
+		pro: true,
 	},
 	{
-		label: "Enable transcript",
-		value: "disableTranscript",
-		description: "Enabling this also allows chapters and summary",
-		pro: true,
+		label: "Captions",
+		value: "disableCaptions",
+		description: "Let viewers turn on captions",
 	},
 	{
-		label: "Show Cap logo",
+		label: "Cap logo",
 		value: "hideShareableLinkCapLogo",
-		description: "Show Cap branding at the top of shareable links",
+		description: "Show Cap branding on share pages",
 		pro: true,
 	},
 ];
@@ -88,6 +93,23 @@ const languageOptions = Object.entries(AI_GENERATION_LANGUAGES) as [
 	string,
 ][];
 
+const languageSelectOptions: SelectOption<AiGenerationLanguage>[] =
+	languageOptions.map(([code], index) => ({
+		label: getAiGenerationLanguageName(code),
+		value: code,
+		separatorBefore: index === 1,
+	}));
+
+const visibilityOptions: SelectOption<boolean>[] = [
+	{ label: "Anyone with the link", value: true },
+	{ label: "Private", value: false },
+];
+
+const speedOptions: SelectOption<number>[] = PLAYBACK_SPEEDS.map((speed) => ({
+	label: `${speed}x`,
+	value: speed,
+}));
+
 const mergeSettings = (
 	settings?: OrganizationSettings | null,
 ): OrganizationSettings => ({
@@ -99,14 +121,28 @@ const mergeSettings = (
 });
 
 const CapSettingsCard = () => {
-	const { user, organizationSettings } = useDashboardContext();
+	const {
+		user,
+		organizationSettings,
+		activeOrganization,
+		instanceVideoDefaultPublic,
+		setUpgradeModalOpen,
+	} = useDashboardContext();
+	const router = useRouter();
 	const initialSettings = mergeSettings(organizationSettings);
 	const [settings, setSettings] =
 		useState<OrganizationSettings>(initialSettings);
-	const [showLanguageMenu, setShowLanguageMenu] = useState(false);
+	const hasDefaultVideoPassword = Boolean(
+		activeOrganization?.organization.hasDefaultVideoPassword,
+	);
+	const [defaultPasswordEnabled, setDefaultPasswordEnabled] = useState(
+		hasDefaultVideoPassword,
+	);
+	const [isChangingDefaultPassword, setIsChangingDefaultPassword] =
+		useState(false);
+	const [defaultPassword, setDefaultPassword] = useState("");
 
 	const lastSavedSettings = useRef<OrganizationSettings>(initialSettings);
-	const languageMenuRef = useRef<HTMLDivElement>(null);
 
 	const debouncedUpdateSettings = useDebounce(settings, 1000);
 	const selectedLanguage =
@@ -119,18 +155,10 @@ const CapSettingsCard = () => {
 	}, [organizationSettings]);
 
 	useEffect(() => {
-		const handleClickOutside = (event: MouseEvent) => {
-			if (
-				languageMenuRef.current &&
-				!languageMenuRef.current.contains(event.target as Node)
-			) {
-				setShowLanguageMenu(false);
-			}
-		};
-
-		document.addEventListener("mousedown", handleClickOutside);
-		return () => document.removeEventListener("mousedown", handleClickOutside);
-	}, []);
+		setDefaultPasswordEnabled(hasDefaultVideoPassword);
+		setIsChangingDefaultPassword(false);
+		setDefaultPassword("");
+	}, [hasDefaultVideoPassword]);
 
 	useEffect(() => {
 		if (
@@ -167,31 +195,39 @@ const CapSettingsCard = () => {
 							return;
 						}
 
+						if (changedKey === "defaultVideoPublic") {
+							toast.success(
+								debouncedUpdateSettings.defaultVideoPublic === false
+									? "New caps will be private"
+									: "New caps will be shared with anyone with the link",
+							);
+							return;
+						}
+
 						if (changedKey === "defaultPlaybackSpeed") {
 							toast.success(
 								`Default playback speed set to ${
 									debouncedUpdateSettings.defaultPlaybackSpeed ??
 									DEFAULT_PLAYBACK_SPEED
-								}×`,
+								}x`,
 							);
 							return;
 						}
 
-						const option = options.find((opt) => opt.value === changedKey);
 						if (changedKey === "hideShareableLinkCapLogo") {
 							toast.success(
 								debouncedUpdateSettings[changedKey]
 									? "Cap logo hidden"
 									: "Cap logo shown",
 							);
-						} else {
-							const isDisabled = Boolean(debouncedUpdateSettings[changedKey]);
-							const action = isDisabled ? "disabled" : "enabled";
-							const label = option?.label.split(" ")[1] || changedKey;
-							toast.success(
-								`${label.charAt(0).toUpperCase()}${label.slice(1)} ${action}`,
-							);
+							return;
 						}
+
+						const option = options.find((opt) => opt.value === changedKey);
+						const action = debouncedUpdateSettings[changedKey]
+							? "disabled"
+							: "enabled";
+						toast.success(`${option?.label ?? changedKey} ${action}`);
 					});
 
 					lastSavedSettings.current = debouncedUpdateSettings;
@@ -235,145 +271,256 @@ const CapSettingsCard = () => {
 
 	const selectedSpeed = settings.defaultPlaybackSpeed ?? DEFAULT_PLAYBACK_SPEED;
 
+	const handleVisibilityChange = (isPublic: boolean) => {
+		setSettings((prev) => ({
+			...prev,
+			defaultVideoPublic: isPublic,
+		}));
+	};
+
+	const defaultVideoPublic =
+		settings.defaultVideoPublic ?? instanceVideoDefaultPublic;
+
+	const saveDefaultPassword = useMutation({
+		mutationFn: async () => {
+			const result = await setOrganizationDefaultVideoPassword(defaultPassword);
+			if (!result.success)
+				throw new Error(result.error ?? "Failed to update default password");
+			return result.value;
+		},
+		onSuccess: () => {
+			toast.success("Default password updated");
+			setDefaultPassword("");
+			setIsChangingDefaultPassword(false);
+			router.refresh();
+		},
+		onError: (error) => {
+			toast.error(error.message);
+		},
+	});
+
+	const removeDefaultPassword = useMutation({
+		mutationFn: async () => {
+			const result = await removeOrganizationDefaultVideoPassword();
+			if (!result.success)
+				throw new Error(result.error ?? "Failed to remove default password");
+			return result.value;
+		},
+		onSuccess: () => {
+			toast.success("Default password removed");
+			setDefaultPassword("");
+			setIsChangingDefaultPassword(false);
+			setDefaultPasswordEnabled(false);
+			router.refresh();
+		},
+		onError: (error) => {
+			toast.error(error.message);
+			setDefaultPasswordEnabled(hasDefaultVideoPassword);
+		},
+	});
+
+	const defaultPasswordPending =
+		saveDefaultPassword.isPending || removeDefaultPassword.isPending;
+
+	const handleDefaultPasswordToggle = (checked: boolean) => {
+		if (checked) {
+			setDefaultPasswordEnabled(true);
+			return;
+		}
+
+		if (hasDefaultVideoPassword) {
+			removeDefaultPassword.mutate();
+			return;
+		}
+
+		setDefaultPasswordEnabled(false);
+		setIsChangingDefaultPassword(false);
+		setDefaultPassword("");
+	};
+
 	const handleLanguageChange = (language: AiGenerationLanguage) => {
 		if (!isAiGenerationLanguage(language)) {
 			return;
 		}
 
-		setShowLanguageMenu(false);
 		setSettings((prev) => ({
 			...prev,
 			aiGenerationLanguage: language,
 		}));
 	};
 
+	const requireProInterceptor = user.isPro
+		? undefined
+		: () => setUpgradeModalOpen(true);
+
 	return (
-		<Card className="flex relative flex-col flex-1 gap-6 w-full min-h-fit">
-			<CardHeader>
-				<CardTitle>Cap Settings</CardTitle>
-				<CardDescription>
-					Enable or disable specific settings for your organization. These
-					settings will be applied as defaults for new caps.
-				</CardDescription>
-			</CardHeader>
-
-			<div className="grid grid-cols-1 gap-3 md:grid-cols-2">
-				{options.map((option) => (
-					<div
-						key={option.value}
-						className="flex gap-10 justify-between items-center p-4 text-left rounded-xl border transition-colors bg-gray-2 min-w-fit border-gray-3"
-					>
-						<div
-							className={clsx("flex flex-col flex-1", option.pro && "gap-1")}
-						>
-							<div className="flex gap-1.5 items-center">
-								<p className="text-sm text-gray-12">{option.label}</p>
-								{option.pro && (
-									<p className="py-1 px-1.5 text-[10px] leading-none font-medium rounded-full text-white bg-blue-11">
-										Pro
-									</p>
-								)}
-							</div>
-							<p className="text-xs text-gray-10">{option.description}</p>
-						</div>
-						<Switch
-							disabled={
-								(option.pro && !user.isPro) ||
-								((option.value === "disableSummary" ||
-									option.value === "disableChapters") &&
-									settings?.disableTranscript)
+		<div className="flex flex-col w-full max-w-2xl">
+			<section>
+				<h2 className="text-sm font-medium text-gray-12">Sharing</h2>
+				<div className="mt-3 rounded-xl border divide-y shadow-xs border-gray-3 divide-gray-3 bg-gray-1">
+					<SettingRow
+						label="Who can view new caps"
+						description="Anyone with the link, or private until the creator shares it."
+						control={
+							<SettingSelect
+								ariaLabel="Who can view new caps"
+								value={defaultVideoPublic}
+								options={visibilityOptions}
+								onChange={handleVisibilityChange}
+							/>
+						}
+					/>
+					<div>
+						<SettingRow
+							label="Password protect new caps"
+							description="New caps get this password automatically. Viewers need it to open the link."
+							control={
+								<Switch
+									aria-label="Password protect new caps"
+									checked={defaultPasswordEnabled}
+									disabled={defaultPasswordPending}
+									onCheckedChange={handleDefaultPasswordToggle}
+								/>
 							}
-							onCheckedChange={() => {
-								handleToggle(option.value);
-							}}
-							checked={!settings?.[option.value]}
 						/>
+						{defaultPasswordEnabled &&
+							(hasDefaultVideoPassword && !isChangingDefaultPassword ? (
+								<div className="flex flex-wrap gap-4 items-center px-4 pb-4">
+									<p className="text-[13px] text-gray-10">
+										A default password is set.
+									</p>
+									<div className="flex gap-4 items-center">
+										<Button
+											size="xs"
+											variant="transparent"
+											className="px-0 h-auto text-[13px]"
+											disabled={defaultPasswordPending}
+											onClick={() => setIsChangingDefaultPassword(true)}
+										>
+											Change
+										</Button>
+										<Button
+											size="xs"
+											variant="transparent"
+											className="px-0 h-auto text-[13px]"
+											disabled={defaultPasswordPending}
+											spinner={removeDefaultPassword.isPending}
+											spinnerColor="var(--gray-12)"
+											onClick={() => removeDefaultPassword.mutate()}
+										>
+											Remove
+										</Button>
+									</div>
+								</div>
+							) : (
+								<div className="flex flex-col gap-2 px-4 pb-4 sm:flex-row sm:items-center">
+									<Input
+										type="password"
+										autoComplete="new-password"
+										maxLength={255}
+										className="sm:max-w-xs"
+										placeholder="New default password"
+										value={defaultPassword}
+										onChange={(e) => setDefaultPassword(e.target.value)}
+									/>
+									<div className="flex gap-2 items-center">
+										<Button
+											size="sm"
+											variant="dark"
+											spinner={saveDefaultPassword.isPending}
+											disabled={
+												defaultPasswordPending ||
+												defaultPassword.trim().length === 0
+											}
+											onClick={() => saveDefaultPassword.mutate()}
+										>
+											Save
+										</Button>
+										{hasDefaultVideoPassword && (
+											<Button
+												size="sm"
+												variant="gray"
+												disabled={defaultPasswordPending}
+												onClick={() => {
+													setIsChangingDefaultPassword(false);
+													setDefaultPassword("");
+												}}
+											>
+												Cancel
+											</Button>
+										)}
+									</div>
+								</div>
+							))}
 					</div>
-				))}
-			</div>
-
-			<div className="flex flex-col gap-3 p-4 text-left rounded-xl border transition-colors bg-gray-2 border-gray-3 sm:flex-row sm:justify-between sm:items-center">
-				<div className="flex flex-col flex-1 gap-1">
-					<div className="flex gap-1.5 items-center">
-						<Gauge className="w-3.5 h-3.5 text-gray-9" />
-						<p className="text-sm text-gray-12">Default playback speed</p>
-					</div>
-					<p className="text-xs text-gray-10">
-						The speed caps start playing at on shareable links. Viewers can
-						still change it.
-					</p>
-				</div>
-				<div className="flex flex-wrap gap-1 items-center p-1 rounded-lg border bg-gray-1 border-gray-3">
-					{PLAYBACK_SPEEDS.map((speed) => (
-						<button
-							key={speed}
-							type="button"
-							onClick={() => handleSpeedChange(speed)}
-							aria-pressed={selectedSpeed === speed}
-							className={clsx(
-								"min-w-10 rounded-md px-2 py-1 text-xs font-medium tabular-nums transition-colors",
-								selectedSpeed === speed
-									? "text-white bg-blue-11"
-									: "text-gray-11 hover:bg-gray-3",
-							)}
-						>
-							{speed}×
-						</button>
-					))}
 				</div>
-			</div>
-
-			<div className="flex flex-col gap-3 p-4 text-left rounded-xl border transition-colors bg-gray-2 border-gray-3 sm:flex-row sm:justify-between sm:items-center">
-				<div className="flex flex-col flex-1 gap-1">
-					<div className="flex gap-1.5 items-center">
-						<p className="text-sm text-gray-12">AI generation language</p>
-						<p className="py-1 px-1.5 text-[10px] leading-none font-medium rounded-full text-white bg-blue-11">
-							Pro
-						</p>
-					</div>
-					<p className="text-xs text-gray-10">
-						Set the language used for transcripts, titles, summaries, and
-						chapters.
-					</p>
+			</section>
+
+			<section className="mt-10">
+				<h2 className="text-sm font-medium text-gray-12">Playback</h2>
+				<div className="mt-3 rounded-xl border divide-y shadow-xs border-gray-3 divide-gray-3 bg-gray-1">
+					<SettingRow
+						label="Default playback speed"
+						description="Starting speed on share pages."
+						control={
+							<SettingSelect
+								ariaLabel="Default playback speed"
+								value={selectedSpeed}
+								options={speedOptions}
+								onChange={handleSpeedChange}
+							/>
+						}
+					/>
+					<SettingRow
+						label="AI generation language"
+						pro
+						description="Used for transcripts, titles, summaries, and chapters."
+						control={
+							<SettingSelect
+								ariaLabel="AI generation language"
+								value={selectedLanguage}
+								options={languageSelectOptions}
+								onChange={handleLanguageChange}
+								onInterceptOpen={requireProInterceptor}
+							/>
+						}
+					/>
 				</div>
-				<div className="relative w-full sm:w-auto" ref={languageMenuRef}>
-					<button
-						onClick={() => setShowLanguageMenu((value) => !value)}
-						disabled={!user.isPro}
-						className="flex items-center gap-1.5 px-2.5 py-1.5 w-full justify-between text-xs font-medium rounded-lg border border-gray-3 bg-gray-1 hover:bg-gray-2 disabled:opacity-50 disabled:cursor-not-allowed transition-colors sm:min-w-40"
-						type="button"
-					>
-						<span className="flex items-center gap-1.5 text-gray-12">
-							<Globe className="w-3 h-3 text-gray-9" />
-							{getAiGenerationLanguageName(selectedLanguage)}
-						</span>
-						<ChevronDown className="w-3 h-3 text-gray-9" />
-					</button>
-					{showLanguageMenu && (
-						<div className="absolute right-0 top-full mt-1 z-50 w-full py-1 bg-gray-1 border border-gray-3 rounded-lg shadow-lg max-h-64 overflow-y-auto sm:w-56">
-							{languageOptions.map(([code, name], index) => (
-								<div key={code}>
-									{index === 1 && (
-										<div className="my-1 border-t border-gray-3" />
-									)}
-									<button
-										onClick={() => handleLanguageChange(code)}
-										className={`w-full px-3 py-1.5 text-left text-xs hover:bg-gray-2 transition-colors ${
-											selectedLanguage === code
-												? "text-blue-500 font-medium"
-												: "text-gray-12"
-										}`}
-										type="button"
-									>
-										{name}
-									</button>
-								</div>
-							))}
-						</div>
-					)}
+			</section>
+
+			<section className="mt-10">
+				<h2 className="text-sm font-medium text-gray-12">Share page</h2>
+				<div className="mt-3 rounded-xl border divide-y shadow-xs border-gray-3 divide-gray-3 bg-gray-1">
+					{options.map((option) => (
+						<SettingRow
+							key={option.value}
+							label={option.label}
+							description={option.description}
+							pro={option.pro}
+							control={
+								<Switch
+									aria-label={option.label}
+									disabled={
+										(option.value === "disableSummary" ||
+											option.value === "disableChapters") &&
+										Boolean(settings?.disableTranscript)
+									}
+									onCheckedChange={() => {
+										if (option.pro && !user.isPro) {
+											setUpgradeModalOpen(true);
+											return;
+										}
+
+										handleToggle(option.value);
+									}}
+									checked={!settings?.[option.value]}
+								/>
+							}
+						/>
+					))}
 				</div>
-			</div>
-		</Card>
+			</section>
+		</div>
 	);
 };
 
diff --git a/apps/web/app/(org)/dashboard/settings/organization/components/CustomDomain.tsx b/apps/web/app/(org)/dashboard/settings/organization/components/CustomDomain.tsx
index 5c04c86f1fe..94a753ecb19 100644
--- a/apps/web/app/(org)/dashboard/settings/organization/components/CustomDomain.tsx
+++ b/apps/web/app/(org)/dashboard/settings/organization/components/CustomDomain.tsx
@@ -8,7 +8,6 @@ import {
 } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useMutation } from "@tanstack/react-query";
-import clsx from "clsx";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
 import { toast } from "sonner";
@@ -18,6 +17,7 @@ import { UpgradeModal } from "@/components/UpgradeModal";
 import { ConfirmationDialog } from "../../../_components/ConfirmationDialog";
 import { useDashboardContext } from "../../../Contexts";
 import CustomDomainDialog from "./CustomDomainDialog/CustomDomainDialog";
+import { SettingRow } from "./SettingsRows";
 
 export function CustomDomain() {
 	const router = useRouter();
@@ -81,78 +81,56 @@ export function CustomDomain() {
 				loading={removeDomainMutation.isPending}
 				onCancel={() => setConfirmOpen(false)}
 			/>
-			<div className="flex flex-col flex-1 gap-3 justify-between w-full md:flex-row md:items-center h-fit">
-				<div className="space-y-4 w-full">
-					<div
-						className={clsx(
-							"flex flex-col md:flex-row gap-3 md:items-center",
-							(isVerified && orgCustomDomain) ||
-								(!isVerified && orgCustomDomain)
-								? "mb-3"
-								: "mb-0",
-						)}
-					>
-						<div className="flex flex-col gap-1">
-							<h1 className="text-sm font-medium text-gray-12">
-								Custom Domain
-							</h1>
-							<p className="w-full text-sm text-gray-10">
-								Setup a custom domain for your organization's shared caps.
-							</p>
-						</div>
-					</div>
-					<div className="flex flex-1 gap-2 justify-between items-center w-full">
-						<div className="flex gap-2 justify-between items-center px-3 flex-1 h-[44px] rounded-xl border bg-gray-2 border-gray-3">
-							<p className="text-[13px] text-gray-8">
-								{orgCustomDomain || "No custom domain has been setup"}
-							</p>
-							<div className="flex items-center">
-								{orgCustomDomain && isVerified ? (
+			<SettingRow
+				label="Custom domain"
+				description="Setup a custom domain for your organization's shared caps."
+				control={
+					<div className="flex gap-2 items-center">
+						{orgCustomDomain && (
+							<div className="flex gap-2 items-center px-3 h-8 rounded-full border shadow-xs bg-gray-1 border-gray-4">
+								<p className="text-[13px] whitespace-nowrap text-gray-12">
+									{orgCustomDomain}
+								</p>
+								{isVerified ? (
 									<Tooltip content="Verified">
-										<div className="flex gap-2 items-center p-2 h-full text-xs rounded-full w-fit text-gray-10">
+										<div className="flex items-center text-gray-10">
 											<FontAwesomeIcon
-												className="text-green-500 size-5"
+												className="text-green-500 size-3.5"
 												icon={faCheckCircle}
 											/>
 										</div>
 									</Tooltip>
 								) : (
-									orgCustomDomain &&
-									!isVerified && (
-										<Tooltip content="Setup not complete">
-											<div className="flex gap-2 items-center p-2 h-full text-xs rounded-full w-fit text-gray-10">
-												<FontAwesomeIcon
-													className="text-red-500 size-5"
-													icon={faExclamationCircle}
-												/>
-											</div>
-										</Tooltip>
-									)
-								)}
-
-								{orgCustomDomain && (
-									<Tooltip content="Remove custom domain">
-										<div
-											onClick={(e) => {
-												e.preventDefault();
-												setConfirmOpen(true);
-											}}
-											className="flex justify-center items-center text-xs rounded-full border transition-colors duration-200 cursor-pointer hover:bg-gray-8 hover:border-gray-9 size-5 bg-gray-6 border-gray-7"
-										>
+									<Tooltip content="Setup not complete">
+										<div className="flex items-center text-gray-10">
 											<FontAwesomeIcon
-												icon={faX}
-												className="text-gray-12 size-[10px]"
+												className="text-red-500 size-3.5"
+												icon={faExclamationCircle}
 											/>
 										</div>
 									</Tooltip>
 								)}
+								<Tooltip content="Remove custom domain">
+									<div
+										onClick={(e) => {
+											e.preventDefault();
+											setConfirmOpen(true);
+										}}
+										className="flex justify-center items-center text-xs rounded-full border transition-colors duration-200 cursor-pointer hover:bg-gray-8 hover:border-gray-9 size-4 bg-gray-6 border-gray-7"
+									>
+										<FontAwesomeIcon
+											icon={faX}
+											className="text-gray-12 size-[8px]"
+										/>
+									</div>
+								</Tooltip>
 							</div>
-						</div>
+						)}
 
 						{!isVerified && (
 							<Button
 								type="submit"
-								size="sm"
+								size="xs"
 								className="min-w-fit"
 								variant="dark"
 								onClick={(e) => {
@@ -164,8 +142,8 @@ export function CustomDomain() {
 							</Button>
 						)}
 					</div>
-				</div>
-			</div>
+				}
+			/>
 
 			{showUpgradeModal && (
 				<UpgradeModal
diff --git a/apps/web/app/(org)/dashboard/settings/organization/components/DeleteOrg.tsx b/apps/web/app/(org)/dashboard/settings/organization/components/DeleteOrg.tsx
index d16d2a862f8..55bbe6df2ce 100644
--- a/apps/web/app/(org)/dashboard/settings/organization/components/DeleteOrg.tsx
+++ b/apps/web/app/(org)/dashboard/settings/organization/components/DeleteOrg.tsx
@@ -1,8 +1,9 @@
-import { Button, Card, CardDescription, CardHeader, CardTitle } from "@cap/ui";
+import { Button } from "@cap/ui";
 import { useState } from "react";
 import { getEffectiveOrganizationRole } from "@/lib/permissions/roles";
 import { useDashboardContext } from "../../../Contexts";
 import DeleteOrgDialog from "./DeleteOrgDialog";
+import { SettingRow } from "./SettingsRows";
 
 const DeleteOrg = () => {
 	const [toggleDeleteDialog, setToggleDeleteDialog] = useState(false);
@@ -25,30 +26,30 @@ const DeleteOrg = () => {
 					onOpenChange={setToggleDeleteDialog}
 				/>
 			)}
-			<Card className="flex flex-wrap gap-6 justify-between items-center w-full">
-				<CardHeader>
-					<CardTitle>Delete Organization</CardTitle>
-					<CardDescription>
-						{canDeleteOrganization
-							? "Delete your organization and all associated data."
-							: "Deleting this organization requires the owner's permission."}
-					</CardDescription>
-				</CardHeader>
-				{canDeleteOrganization && (
-					<Button
-						variant="destructive"
-						disabled={!activeOrganization || !organizationData}
-						size="sm"
-						onClick={(e) => {
-							e.stopPropagation();
-							e.preventDefault();
-							setToggleDeleteDialog(true);
-						}}
-					>
-						Delete Organization
-					</Button>
-				)}
-			</Card>
+			<SettingRow
+				label="Delete organization"
+				description={
+					canDeleteOrganization
+						? "Delete your organization and all associated data."
+						: "Deleting this organization requires the owner's permission."
+				}
+				control={
+					canDeleteOrganization ? (
+						<Button
+							variant="destructive"
+							disabled={!activeOrganization || !organizationData}
+							size="sm"
+							onClick={(e) => {
+								e.stopPropagation();
+								e.preventDefault();
+								setToggleDeleteDialog(true);
+							}}
+						>
+							Delete organization
+						</Button>
+					) : null
+				}
+			/>
 		</>
 	);
 };
diff --git a/apps/web/app/(org)/dashboard/settings/organization/components/OrgName.tsx b/apps/web/app/(org)/dashboard/settings/organization/components/OrgName.tsx
index 1e480ca516a..7e5ceaebf61 100644
--- a/apps/web/app/(org)/dashboard/settings/organization/components/OrgName.tsx
+++ b/apps/web/app/(org)/dashboard/settings/organization/components/OrgName.tsx
@@ -1,11 +1,12 @@
 "use client";
 
-import { Button, Input, Label } from "@cap/ui";
+import { Button, Input } from "@cap/ui";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
 import { toast } from "sonner";
 import { updateOrganizationDetails } from "@/actions/organization/update-details";
 import { useDashboardContext } from "../../../Contexts";
+import { SettingRow } from "./SettingsRows";
 
 const OrgName = () => {
 	const { activeOrganization } = useDashboardContext();
@@ -32,42 +33,40 @@ const OrgName = () => {
 	};
 
 	return (
-		<div className="flex-1 space-y-4">
-			<div className="space-y-1">
-				<Label htmlFor="organizationName">Name</Label>
-				<p className="text-sm text-gray-10">
-					Changing the name will update how your organization appears to others
-					members.
-				</p>
-			</div>
-			<div className="flex flex-col gap-3 w-full md:items-center md:flex-row">
-				<Input
-					type="text"
-					className="bg-gray-2"
-					value={orgName}
-					id="organizationName"
-					name="organizationName"
-					onChange={(e) => {
-						setOrgName(e.target.value);
-					}}
-				/>
-				<Button
-					type="submit"
-					size="sm"
-					className="min-w-fit"
-					variant="dark"
-					spinner={saveLoading}
-					onClick={handleOrgNameChange}
-					disabled={
-						saveLoading ||
-						orgName === activeOrganization?.organization.name ||
-						!orgName
-					}
-				>
-					{saveLoading ? null : "Save"}
-				</Button>
-			</div>
-		</div>
+		<SettingRow
+			label="Organization name"
+			description="Changing the name will update how your organization appears to other members."
+			control={
+				<div className="flex gap-2 items-center">
+					<Input
+						type="text"
+						aria-label="Organization name"
+						className="px-3 w-56 h-8 rounded-lg shadow-xs"
+						value={orgName}
+						id="organizationName"
+						name="organizationName"
+						onChange={(e) => {
+							setOrgName(e.target.value);
+						}}
+					/>
+					<Button
+						type="submit"
+						size="xs"
+						className="min-w-fit"
+						variant="dark"
+						spinner={saveLoading}
+						onClick={handleOrgNameChange}
+						disabled={
+							saveLoading ||
+							orgName === activeOrganization?.organization.name ||
+							!orgName
+						}
+					>
+						{saveLoading ? null : "Save"}
+					</Button>
+				</div>
+			}
+		/>
 	);
 };
 
diff --git a/apps/web/app/(org)/dashboard/settings/organization/components/OrganizationDetailsCard.tsx b/apps/web/app/(org)/dashboard/settings/organization/components/OrganizationDetailsCard.tsx
deleted file mode 100644
index 1174ce0ff6e..00000000000
--- a/apps/web/app/(org)/dashboard/settings/organization/components/OrganizationDetailsCard.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-"use client";
-
-import { Card, CardDescription, CardHeader, CardTitle } from "@cap/ui";
-import AccessEmailDomain from "./AccessEmailDomain";
-import { CustomDomain } from "./CustomDomain";
-import { OrganizationIcon } from "./OrganizationIcon";
-import OrgName from "./OrgName";
-import { ShareableLinkIcon } from "./ShareableLinkIcon";
-
-export const OrganizationDetailsCard = () => {
-	return (
-		<Card className="flex flex-col flex-1 gap-6 w-full min-h-fit">
-			<CardHeader>
-				<CardTitle>Settings</CardTitle>
-				<CardDescription>
-					Set the organization name, access email domain, custom domain, and
-					organization icons.
-				</CardDescription>
-			</CardHeader>
-			<div className="grid grid-cols-1 gap-8 md:grid-cols-2">
-				<OrgName />
-				<CustomDomain />
-				<OrganizationIcon />
-				<ShareableLinkIcon />
-				<AccessEmailDomain />
-			</div>
-		</Card>
-	);
-};
diff --git a/apps/web/app/(org)/dashboard/settings/organization/components/OrganizationIcon.tsx b/apps/web/app/(org)/dashboard/settings/organization/components/OrganizationIcon.tsx
index 400320cafd5..e0e17814094 100644
--- a/apps/web/app/(org)/dashboard/settings/organization/components/OrganizationIcon.tsx
+++ b/apps/web/app/(org)/dashboard/settings/organization/components/OrganizationIcon.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { CardDescription, Label } from "@cap/ui";
 import type { Organisation } from "@cap/web-domain";
 import { Effect, Option } from "effect";
 import { useRouter } from "next/navigation";
@@ -9,6 +8,7 @@ import { toast } from "sonner";
 import { FileInput } from "@/components/FileInput";
 import { useEffectMutation, useRpcClient } from "@/lib/EffectRuntime";
 import { useDashboardContext } from "../../../Contexts";
+import { SettingRow } from "./SettingsRows";
 
 export const OrganizationIcon = () => {
 	const router = useRouter();
@@ -68,31 +68,30 @@ export const OrganizationIcon = () => {
 	});
 
 	return (
-		<div className="flex-1 space-y-4">
-			<div className="space-y-1">
-				<Label htmlFor="icon">Organization Icon</Label>
-				<CardDescription className="w-full">
-					Upload a custom logo or icon for your organization.
-				</CardDescription>
-			</div>
-			<FileInput
-				height={44}
-				previewIconSize={20}
-				id={iconInputId}
-				name="icon"
-				onChange={(file) => {
-					if (!file || !organizationId) return;
-					uploadIcon.mutate({ organizationId, file });
-				}}
-				disabled={uploadIcon.isPending}
-				isLoading={uploadIcon.isPending}
-				initialPreviewUrl={existingIconUrl}
-				onRemove={() => {
-					if (!organizationId) return;
-					removeIcon.mutate(organizationId);
-				}}
-				maxFileSizeBytes={1 * 1024 * 1024} // 1MB
-			/>
-		</div>
+		<SettingRow
+			label="Icon"
+			description="Upload a custom logo or icon for your organization."
+			control={
+				<FileInput
+					className="w-[248px] max-w-full"
+					height={36}
+					previewIconSize={18}
+					id={iconInputId}
+					name="icon"
+					onChange={(file) => {
+						if (!file || !organizationId) return;
+						uploadIcon.mutate({ organizationId, file });
+					}}
+					disabled={uploadIcon.isPending}
+					isLoading={uploadIcon.isPending}
+					initialPreviewUrl={existingIconUrl}
+					onRemove={() => {
+						if (!organizationId) return;
+						removeIcon.mutate(organizationId);
+					}}
+					maxFileSizeBytes={1 * 1024 * 1024}
+				/>
+			}
+		/>
 	);
 };
diff --git a/apps/web/app/(org)/dashboard/settings/organization/components/SettingsRows.tsx b/apps/web/app/(org)/dashboard/settings/organization/components/SettingsRows.tsx
new file mode 100644
index 00000000000..73c938741d2
--- /dev/null
+++ b/apps/web/app/(org)/dashboard/settings/organization/components/SettingsRows.tsx
@@ -0,0 +1,125 @@
+"use client";
+
+import clsx from "clsx";
+import { Check, ChevronDown } from "lucide-react";
+import { type ReactNode, useEffect, useRef, useState } from "react";
+
+export type SelectOption<T> = {
+	label: string;
+	value: T;
+	separatorBefore?: boolean;
+};
+
+export const ProChip = () => (
+	<span className="py-1 px-1.5 text-[10px] font-medium leading-none text-white rounded-full bg-blue-11">
+		Pro
+	</span>
+);
+
+export function SettingSelect<T extends string | number | boolean>({
+	value,
+	options: selectOptions,
+	onChange,
+	ariaLabel,
+	onInterceptOpen,
+}: {
+	value: T;
+	options: SelectOption<T>[];
+	onChange: (value: T) => void;
+	ariaLabel: string;
+	onInterceptOpen?: () => void;
+}) {
+	const [open, setOpen] = useState(false);
+	const containerRef = useRef<HTMLDivElement>(null);
+
+	useEffect(() => {
+		if (!open) return;
+
+		const handleClickOutside = (event: MouseEvent) => {
+			if (
+				containerRef.current &&
+				!containerRef.current.contains(event.target as Node)
+			) {
+				setOpen(false);
+			}
+		};
+
+		document.addEventListener("mousedown", handleClickOutside);
+		return () => document.removeEventListener("mousedown", handleClickOutside);
+	}, [open]);
+
+	const selected = selectOptions.find((option) => option.value === value);
+
+	return (
+		<div className="relative" ref={containerRef}>
+			<button
+				type="button"
+				aria-label={ariaLabel}
+				aria-haspopup="menu"
+				aria-expanded={open}
+				onClick={() => {
+					if (onInterceptOpen) {
+						onInterceptOpen();
+						return;
+					}
+
+					setOpen((isOpen) => !isOpen);
+				}}
+				className="flex gap-1.5 items-center px-3 h-8 rounded-full border transition-colors border-gray-4 bg-gray-1 hover:bg-gray-2 text-[13px] text-gray-12 shadow-xs"
+			>
+				<span className="whitespace-nowrap">{selected?.label}</span>
+				<ChevronDown className="w-3.5 h-3.5 shrink-0 text-gray-9" />
+			</button>
+			{open && (
+				<div className="overflow-y-auto absolute right-0 top-full z-50 p-1 mt-1.5 w-max rounded-xl border shadow-lg min-w-44 max-h-64 bg-gray-1 border-gray-3">
+					{selectOptions.map((option) => (
+						<div key={String(option.value)}>
+							{option.separatorBefore && (
+								<div className="my-1 -mx-1 border-t border-gray-3" />
+							)}
+							<button
+								type="button"
+								onClick={() => {
+									setOpen(false);
+									onChange(option.value);
+								}}
+								className={clsx(
+									"flex gap-3 justify-between items-center px-2.5 py-1.5 w-full text-left rounded-lg transition-colors text-[13px] text-gray-12",
+									option.value === value ? "bg-gray-3" : "hover:bg-gray-2",
+								)}
+							>
+								<span className="whitespace-nowrap">{option.label}</span>
+								{option.value === value && (
+									<Check className="w-3.5 h-3.5 shrink-0 text-gray-12" />
+								)}
+							</button>
+						</div>
+					))}
+				</div>
+			)}
+		</div>
+	);
+}
+
+export const SettingRow = ({
+	label,
+	description,
+	pro,
+	control,
+}: {
+	label: string;
+	description: string;
+	pro?: boolean;
+	control: ReactNode;
+}) => (
+	<div className="flex flex-col gap-2 items-start py-3.5 px-4 sm:flex-row sm:gap-6 sm:justify-between sm:items-center">
+		<div className="flex flex-col gap-0.5">
+			<div className="flex gap-1.5 items-center">
+				<p className="text-sm font-medium text-gray-12">{label}</p>
+				{pro && <ProChip />}
+			</div>
+			<p className="max-w-md text-[13px] text-gray-10">{description}</p>
+		</div>
+		<div className="shrink-0">{control}</div>
+	</div>
+);
diff --git a/apps/web/app/(org)/dashboard/settings/organization/components/ShareableLinkIcon.tsx b/apps/web/app/(org)/dashboard/settings/organization/components/ShareableLinkIcon.tsx
index ade1e8331a1..53b13b0062c 100644
--- a/apps/web/app/(org)/dashboard/settings/organization/components/ShareableLinkIcon.tsx
+++ b/apps/web/app/(org)/dashboard/settings/organization/components/ShareableLinkIcon.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { CardDescription, Label, Switch } from "@cap/ui";
+import { Switch } from "@cap/ui";
 import type { Organisation } from "@cap/web-domain";
 import { useMutation } from "@tanstack/react-query";
 import { useRouter } from "next/navigation";
@@ -14,6 +14,7 @@ import {
 import { FileInput } from "@/components/FileInput";
 import { UpgradeModal } from "@/components/UpgradeModal";
 import { useDashboardContext } from "../../../Contexts";
+import { SettingRow } from "./SettingsRows";
 
 export const ShareableLinkIcon = () => {
 	const router = useRouter();
@@ -112,26 +113,56 @@ export const ShareableLinkIcon = () => {
 
 	return (
 		<>
-			<div className="flex-1 space-y-4">
-				<div className="space-y-1">
-					<div className="flex gap-1.5 items-center">
-						<Label htmlFor={iconInputId}>Shareable link icon</Label>
-						<p className="py-1 px-1.5 text-[10px] leading-none font-medium rounded-full text-white bg-blue-11">
-							Pro
+			<div>
+				<SettingRow
+					label="Share page icon"
+					pro
+					description="Use a custom logo or icon on your shareable link pages."
+					control={
+						<FileInput
+							className="w-[248px] max-w-full"
+							height={36}
+							previewIconSize={18}
+							id={iconInputId}
+							name="shareable-link-icon"
+							onChange={(file) => {
+								if (!file || !organizationId) return;
+								if (!user.isPro) {
+									setShowUpgradeModal(true);
+									return;
+								}
+								uploadIcon.mutate({ organizationId, file });
+							}}
+							disabled={!user.isPro || useOrganizationIconChecked || isMutating}
+							isLoading={uploadIcon.isPending}
+							initialPreviewUrl={
+								useOrganizationIconChecked
+									? (organization?.iconUrl ?? null)
+									: existingIconUrl
+							}
+							onRemove={() => {
+								if (!organizationId) return;
+								if (!user.isPro) {
+									setShowUpgradeModal(true);
+									return;
+								}
+								removeIcon.mutate(organizationId);
+							}}
+							maxFileSizeBytes={1024 * 1024}
+						/>
+					}
+				/>
+				<div className="flex flex-col gap-2 items-start px-4 pb-4 sm:flex-row sm:gap-6 sm:justify-between sm:items-center">
+					<div className="flex flex-col gap-0.5">
+						<p className="text-[13px] font-medium text-gray-12">
+							Use organization icon
 						</p>
-					</div>
-					<CardDescription className="w-full">
-						Use a custom logo or icon on your shareable link pages.
-					</CardDescription>
-				</div>
-				<div className="flex items-center justify-between gap-4 rounded-xl border border-gray-3 bg-gray-2 p-4">
-					<div className="space-y-1">
-						<p className="text-sm text-gray-12">Use organization icon</p>
-						<p className="text-xs text-gray-10">
+						<p className="max-w-md text-[13px] text-gray-10">
 							Use the organization icon when one is available.
 						</p>
 					</div>
 					<Switch
+						aria-label="Use organization icon"
 						disabled={!user.isPro || !hasOrganizationIcon || isMutating}
 						checked={useOrganizationIconChecked}
 						onCheckedChange={(checked) => {
@@ -149,36 +180,6 @@ export const ShareableLinkIcon = () => {
 						}}
 					/>
 				</div>
-				<FileInput
-					height={44}
-					previewIconSize={20}
-					id={iconInputId}
-					name="shareable-link-icon"
-					onChange={(file) => {
-						if (!file || !organizationId) return;
-						if (!user.isPro) {
-							setShowUpgradeModal(true);
-							return;
-						}
-						uploadIcon.mutate({ organizationId, file });
-					}}
-					disabled={!user.isPro || useOrganizationIconChecked || isMutating}
-					isLoading={uploadIcon.isPending}
-					initialPreviewUrl={
-						useOrganizationIconChecked
-							? (organization?.iconUrl ?? null)
-							: existingIconUrl
-					}
-					onRemove={() => {
-						if (!organizationId) return;
-						if (!user.isPro) {
-							setShowUpgradeModal(true);
-							return;
-						}
-						removeIcon.mutate(organizationId);
-					}}
-					maxFileSizeBytes={1024 * 1024}
-				/>
 			</div>
 			<UpgradeModal
 				open={showUpgradeModal}
diff --git a/apps/web/app/(org)/dashboard/settings/organization/integrations/slack-integration.tsx b/apps/web/app/(org)/dashboard/settings/organization/integrations/slack-integration.tsx
index cd86cf0dc74..d60a7ecb86e 100644
--- a/apps/web/app/(org)/dashboard/settings/organization/integrations/slack-integration.tsx
+++ b/apps/web/app/(org)/dashboard/settings/organization/integrations/slack-integration.tsx
@@ -2,12 +2,37 @@
 
 import { Button } from "@cap/ui";
 import type { Organisation } from "@cap/web-domain";
-import { MessageSquareIcon } from "lucide-react";
 import { useRouter } from "next/navigation";
 import { useEffect, useTransition } from "react";
 import { toast } from "sonner";
 import { disconnectOrganizationSlack } from "@/actions/organization/slack";
 
+const SlackIcon = ({ className }: { className?: string }) => (
+	<svg
+		viewBox="0 0 127 127"
+		className={className}
+		aria-hidden="true"
+		focusable="false"
+	>
+		<path
+			d="M27.2 80c0 7.3-5.9 13.2-13.2 13.2C6.7 93.2.8 87.3.8 80c0-7.3 5.9-13.2 13.2-13.2h13.2V80zm6.6 0c0-7.3 5.9-13.2 13.2-13.2 7.3 0 13.2 5.9 13.2 13.2v33c0 7.3-5.9 13.2-13.2 13.2-7.3 0-13.2-5.9-13.2-13.2V80z"
+			fill="#E01E5A"
+		/>
+		<path
+			d="M47 27c-7.3 0-13.2-5.9-13.2-13.2C33.8 6.5 39.7.6 47 .6c7.3 0 13.2 5.9 13.2 13.2V27H47zm0 6.7c7.3 0 13.2 5.9 13.2 13.2 0 7.3-5.9 13.2-13.2 13.2H13.9C6.6 60.1.7 54.2.7 46.9c0-7.3 5.9-13.2 13.2-13.2H47z"
+			fill="#36C5F0"
+		/>
+		<path
+			d="M99.9 46.9c0-7.3 5.9-13.2 13.2-13.2 7.3 0 13.2 5.9 13.2 13.2 0 7.3-5.9 13.2-13.2 13.2H99.9V46.9zm-6.6 0c0 7.3-5.9 13.2-13.2 13.2-7.3 0-13.2-5.9-13.2-13.2V13.8C66.9 6.5 72.8.6 80.1.6c7.3 0 13.2 5.9 13.2 13.2v33.1z"
+			fill="#2EB67D"
+		/>
+		<path
+			d="M80.1 99.8c7.3 0 13.2 5.9 13.2 13.2 0 7.3-5.9 13.2-13.2 13.2-7.3 0-13.2-5.9-13.2-13.2V99.8h13.2zm0-6.6c-7.3 0-13.2-5.9-13.2-13.2 0-7.3 5.9-13.2 13.2-13.2h33.1c7.3 0 13.2 5.9 13.2 13.2 0 7.3-5.9 13.2-13.2 13.2H80.1z"
+			fill="#ECB22E"
+		/>
+	</svg>
+);
+
 type SlackInstallation = {
 	id: string;
 	teamId: string;
@@ -95,9 +120,9 @@ export function SlackIntegration({
 	};
 
 	return (
-		<div className="rounded-xl border border-gray-3 overflow-hidden">
+		<div className="rounded-xl border border-gray-3 overflow-hidden bg-gray-1 shadow-xs">
 			<div className="flex items-center gap-3 px-3.5 py-3">
-				<MessageSquareIcon className="size-4 shrink-0 text-gray-10" />
+				<SlackIcon className="size-4 shrink-0" />
 				<div className="flex-1 min-w-0">
 					<p className="text-[13px] font-medium text-gray-12">Slack</p>
 					<p className="text-[11px] text-gray-9">
diff --git a/apps/web/app/(org)/dashboard/settings/organization/integrations/storage-integrations.tsx b/apps/web/app/(org)/dashboard/settings/organization/integrations/storage-integrations.tsx
index 0e4cfa1be7d..df3fd733283 100644
--- a/apps/web/app/(org)/dashboard/settings/organization/integrations/storage-integrations.tsx
+++ b/apps/web/app/(org)/dashboard/settings/organization/integrations/storage-integrations.tsx
@@ -332,7 +332,7 @@ export function OrganizationStorageIntegrations({
 				</div>
 			)}
 
-			<div className="rounded-xl border border-gray-3 overflow-hidden">
+			<div className="rounded-xl border border-gray-3 overflow-hidden bg-gray-1 shadow-xs">
 				<button
 					type="button"
 					onClick={() => toggleExpand("s3")}
@@ -509,7 +509,7 @@ export function OrganizationStorageIntegrations({
 				)}
 			</div>
 
-			<div className="rounded-xl border border-gray-3 overflow-hidden">
+			<div className="rounded-xl border border-gray-3 overflow-hidden bg-gray-1 shadow-xs">
 				<button
 					type="button"
 					onClick={() => toggleExpand("googleDrive")}
diff --git a/apps/web/app/api/desktop/[...route]/video.ts b/apps/web/app/api/desktop/[...route]/video.ts
index 2db9602e7ef..d236a7d3004 100644
--- a/apps/web/app/api/desktop/[...route]/video.ts
+++ b/apps/web/app/api/desktop/[...route]/video.ts
@@ -13,7 +13,7 @@ import {
 import type { VideoMetadata } from "@cap/database/types";
 import { serverEnv } from "@cap/env";
 import { userIsPro } from "@cap/utils";
-import { Storage } from "@cap/web-backend";
+import { resolveNewVideoDefaults, Storage } from "@cap/web-backend";
 import { Organisation, Video } from "@cap/web-domain";
 import { zValidator } from "@hono/zod-validator";
 import { and, count, eq, lte } from "drizzle-orm";
@@ -262,6 +262,7 @@ app.get(
 			}
 
 			const idToUse = Video.VideoId.make(nanoId());
+			const videoDefaults = await resolveNewVideoDefaults(db(), videoOrgId);
 
 			const videoName =
 				name ??
@@ -311,7 +312,8 @@ app.get(
 					isScreenshot,
 					bucket: Option.getOrNull(writable.bucketId),
 					storageIntegrationId: Option.getOrNull(writable.storageIntegrationId),
-					public: serverEnv().CAP_VIDEOS_DEFAULT_PUBLIC,
+					public: videoDefaults.public,
+					password: videoDefaults.password,
 					duration: durationInSecs,
 					width,
 					height,
diff --git a/apps/web/app/api/mobile/[...route]/route.ts b/apps/web/app/api/mobile/[...route]/route.ts
index 084b7f1a0e1..274075bdba2 100644
--- a/apps/web/app/api/mobile/[...route]/route.ts
+++ b/apps/web/app/api/mobile/[...route]/route.ts
@@ -13,6 +13,7 @@ import {
 	findScreenshotObjectKey,
 	getCurrentUser,
 	ImageUploads,
+	resolveNewVideoDefaults,
 	Storage,
 	Videos,
 	VideosRepo,
@@ -2338,6 +2339,9 @@ const importLoom = Effect.fn("Mobile.importLoom")(function* (
 	);
 	const videoId = Video.VideoId.make(nanoId());
 	const now = new Date();
+	const videoDefaults = yield* database.use((db) =>
+		resolveNewVideoDefaults(db, user.activeOrganizationId),
+	);
 	const importState = yield* database.use((db) =>
 		db.transaction(async (tx) => {
 			const [existing] = await tx
@@ -2384,7 +2388,8 @@ const importLoom = Effect.fn("Mobile.importLoom")(function* (
 				source: { type: "webMP4" },
 				bucket: Option.getOrNull(writable.bucketId),
 				storageIntegrationId: Option.getOrNull(writable.storageIntegrationId),
-				public: serverEnv().CAP_VIDEOS_DEFAULT_PUBLIC,
+				public: videoDefaults.public,
+				password: videoDefaults.password,
 				duration: download.durationSeconds,
 				width: download.width,
 				height: download.height,
@@ -2467,11 +2472,15 @@ const createUpload = Effect.fn("Mobile.createUpload")(function* (
 		user.id,
 		organizationId,
 	);
+	const videoDefaults = yield* database.use((db) =>
+		resolveNewVideoDefaults(db, organizationId),
+	);
 	const videoId = yield* repo.create({
 		ownerId: user.id,
 		orgId: organizationId,
 		name: getUploadTitle(input.fileName),
-		public: serverEnv().CAP_VIDEOS_DEFAULT_PUBLIC,
+		public: videoDefaults.public,
+		password: videoDefaults.password ?? undefined,
 		source: { type: "webMP4" },
 		bucketId: writable.bucketId,
 		storageIntegrationId: writable.storageIntegrationId,
@@ -2562,11 +2571,15 @@ const createRecording = Effect.fn("Mobile.createRecording")(function* (
 		user.id,
 		organizationId,
 	);
+	const videoDefaults = yield* database.use((db) =>
+		resolveNewVideoDefaults(db, organizationId),
+	);
 	const videoId = yield* repo.create({
 		ownerId: user.id,
 		orgId: organizationId,
 		name: getUploadTitle(input.fileName),
-		public: serverEnv().CAP_VIDEOS_DEFAULT_PUBLIC,
+		public: videoDefaults.public,
+		password: videoDefaults.password ?? undefined,
 		source: { type: "desktopSegments" },
 		bucketId: writable.bucketId,
 		storageIntegrationId: writable.storageIntegrationId,
diff --git a/apps/web/app/api/v1/[...route]/route.ts b/apps/web/app/api/v1/[...route]/route.ts
index ca9726bbc72..b64a9e5eedb 100644
--- a/apps/web/app/api/v1/[...route]/route.ts
+++ b/apps/web/app/api/v1/[...route]/route.ts
@@ -28,6 +28,7 @@ import {
 	getGoogleDriveUserEmail,
 	ImageUploads,
 	resolveEffectiveVideoRules,
+	resolveNewVideoDefaults,
 	Storage,
 	Videos,
 } from "@cap/web-backend";
@@ -2349,6 +2350,9 @@ const queueAgentLoomImport = Effect.fn("Agent.queueLoomImport")(
 					);
 					const rawFileKey = `${ownerId}/${videoId}/raw-upload.mp4`;
 					const now = new Date();
+					const videoDefaults = yield* database.use((db) =>
+						resolveNewVideoDefaults(db, input.organizationId),
+					);
 					const importState = yield* database.use((db) =>
 						db.transaction(async (tx) => {
 							const [existingImport] = await tx
@@ -2385,7 +2389,8 @@ const queueAgentLoomImport = Effect.fn("Agent.queueLoomImport")(
 										storageIntegrationId: Option.getOrNull(
 											writable.storageIntegrationId,
 										),
-										public: serverEnv().CAP_VIDEOS_DEFAULT_PUBLIC,
+										public: videoDefaults.public,
+										password: videoDefaults.password,
 										duration: download.durationSeconds,
 										width: download.width,
 										height: download.height,
@@ -6578,6 +6583,9 @@ const AgentManagementHandlersLive = HttpApiBuilder.group(
 						if (title.length > 255) {
 							return yield* badRequest(requestId, "Upload title is too long");
 						}
+						const videoDefaults = yield* database.use((db) =>
+							resolveNewVideoDefaults(db, organizationId),
+						);
 						const state = yield* runAgentMutation({
 							principal,
 							operation: "create_upload",
@@ -6598,7 +6606,8 @@ const AgentManagementHandlersLive = HttpApiBuilder.group(
 										writable.storageIntegrationId,
 									),
 									folderId: payload.folderId ?? null,
-									public: serverEnv().CAP_VIDEOS_DEFAULT_PUBLIC,
+									public: videoDefaults.public,
+									password: videoDefaults.password,
 									duration: payload.durationSeconds,
 									width: payload.width,
 									height: payload.height,
diff --git a/apps/web/lib/agent-management.ts b/apps/web/lib/agent-management.ts
index 4fac2b212a1..bdbebfa56a3 100644
--- a/apps/web/lib/agent-management.ts
+++ b/apps/web/lib/agent-management.ts
@@ -65,6 +65,7 @@ export const agentOrganizationSettings = (
 		shareableLinkUseOrganizationIcon?: boolean;
 		aiGenerationLanguage?: (typeof Agent.AgentAiGenerationLanguage)["Type"];
 		defaultPlaybackSpeed?: number;
+		defaultVideoPublic?: boolean;
 	} | null,
 ): (typeof Agent.AgentOrganizationSettings)["Type"] => ({
 	disableSummary: settings?.disableSummary ?? null,
@@ -78,6 +79,7 @@ export const agentOrganizationSettings = (
 		settings?.shareableLinkUseOrganizationIcon ?? null,
 	aiGenerationLanguage: settings?.aiGenerationLanguage ?? null,
 	defaultPlaybackSpeed: settings?.defaultPlaybackSpeed ?? null,
+	defaultVideoPublic: settings?.defaultVideoPublic ?? null,
 });
 
 const scopedAction = (
diff --git a/packages/database/migrations/0040_crazy_champions.sql b/packages/database/migrations/0040_crazy_champions.sql
new file mode 100644
index 00000000000..81fff8186dc
--- /dev/null
+++ b/packages/database/migrations/0040_crazy_champions.sql
@@ -0,0 +1 @@
+ALTER TABLE `organizations` ADD `defaultVideoPassword` text;
\ No newline at end of file
diff --git a/packages/database/migrations/meta/0040_snapshot.json b/packages/database/migrations/meta/0040_snapshot.json
new file mode 100644
index 00000000000..1b18cd2085b
--- /dev/null
+++ b/packages/database/migrations/meta/0040_snapshot.json
@@ -0,0 +1,4103 @@
+{
+	"version": "5",
+	"dialect": "mysql",
+	"id": "7cc4302a-23e9-470c-9b41-aaa121a66b45",
+	"prevId": "c95c8755-4ef8-4c51-ad10-5bd19717d269",
+	"tables": {
+		"accounts": {
+			"name": "accounts",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"type": {
+					"name": "type",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"provider": {
+					"name": "provider",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"providerAccountId": {
+					"name": "providerAccountId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"access_token": {
+					"name": "access_token",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"expires_in": {
+					"name": "expires_in",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"id_token": {
+					"name": "id_token",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"refresh_token": {
+					"name": "refresh_token",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"refresh_token_expires_in": {
+					"name": "refresh_token_expires_in",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"scope": {
+					"name": "scope",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"token_type": {
+					"name": "token_type",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"tempColumn": {
+					"name": "tempColumn",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"user_id_idx": {
+					"name": "user_id_idx",
+					"columns": ["userId"],
+					"isUnique": false
+				},
+				"provider_account_id_idx": {
+					"name": "provider_account_id_idx",
+					"columns": ["providerAccountId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"accounts_id": {
+					"name": "accounts_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"agent_api_authorization_codes": {
+			"name": "agent_api_authorization_codes",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"codeHash": {
+					"name": "codeHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"codeChallenge": {
+					"name": "codeChallenge",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"redirectUri": {
+					"name": "redirectUri",
+					"type": "varchar(512)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"scopes": {
+					"name": "scopes",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"expiresAt": {
+					"name": "expiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"consumedAt": {
+					"name": "consumedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"code_hash_idx": {
+					"name": "code_hash_idx",
+					"columns": ["codeHash"],
+					"isUnique": true
+				},
+				"expires_at_idx": {
+					"name": "expires_at_idx",
+					"columns": ["expiresAt"],
+					"isUnique": false
+				},
+				"user_created_at_idx": {
+					"name": "user_created_at_idx",
+					"columns": ["userId", "createdAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"agent_api_authorization_codes_id": {
+					"name": "agent_api_authorization_codes_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"agent_api_idempotency": {
+			"name": "agent_api_idempotency",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"operation": {
+					"name": "operation",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"keyHash": {
+					"name": "keyHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"requestHash": {
+					"name": "requestHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"state": {
+					"name": "state",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'pending'"
+				},
+				"statusCode": {
+					"name": "statusCode",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"response": {
+					"name": "response",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"expiresAt": {
+					"name": "expiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"user_operation_key_idx": {
+					"name": "user_operation_key_idx",
+					"columns": ["userId", "operation", "keyHash"],
+					"isUnique": true
+				},
+				"expires_at_idx": {
+					"name": "expires_at_idx",
+					"columns": ["expiresAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"agent_api_idempotency_id": {
+					"name": "agent_api_idempotency_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"agent_api_keys": {
+			"name": "agent_api_keys",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"tokenHash": {
+					"name": "tokenHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(100)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'Cap CLI'"
+				},
+				"scopes": {
+					"name": "scopes",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"expiresAt": {
+					"name": "expiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"revokedAt": {
+					"name": "revokedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"lastUsedAt": {
+					"name": "lastUsedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"token_hash_idx": {
+					"name": "token_hash_idx",
+					"columns": ["tokenHash"],
+					"isUnique": true
+				},
+				"user_created_at_idx": {
+					"name": "user_created_at_idx",
+					"columns": ["userId", "createdAt"],
+					"isUnique": false
+				},
+				"expires_at_idx": {
+					"name": "expires_at_idx",
+					"columns": ["expiresAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"agent_api_keys_id": {
+					"name": "agent_api_keys_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"agent_api_operations": {
+			"name": "agent_api_operations",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"kind": {
+					"name": "kind",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"resourceId": {
+					"name": "resourceId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"resultResourceId": {
+					"name": "resultResourceId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"state": {
+					"name": "state",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'queued'"
+				},
+				"payload": {
+					"name": "payload",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"result": {
+					"name": "result",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"errorCode": {
+					"name": "errorCode",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"errorMessage": {
+					"name": "errorMessage",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"completedAt": {
+					"name": "completedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"user_created_at_idx": {
+					"name": "user_created_at_idx",
+					"columns": ["userId", "createdAt"],
+					"isUnique": false
+				},
+				"state_updated_at_idx": {
+					"name": "state_updated_at_idx",
+					"columns": ["state", "updatedAt"],
+					"isUnique": false
+				},
+				"resource_id_idx": {
+					"name": "resource_id_idx",
+					"columns": ["resourceId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"agent_api_operations_id": {
+					"name": "agent_api_operations_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"auth_api_keys": {
+			"name": "auth_api_keys",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(36)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"source": {
+					"name": "source",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'unknown'"
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"user_id_created_at_idx": {
+					"name": "user_id_created_at_idx",
+					"columns": ["userId", "createdAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"auth_api_keys_id": {
+					"name": "auth_api_keys_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"comments": {
+			"name": "comments",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"type": {
+					"name": "type",
+					"type": "varchar(6)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"content": {
+					"name": "content",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"timestamp": {
+					"name": "timestamp",
+					"type": "float",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"authorId": {
+					"name": "authorId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"parentCommentId": {
+					"name": "parentCommentId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"mediaKey": {
+					"name": "mediaKey",
+					"type": "varchar(512)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"mediaDuration": {
+					"name": "mediaDuration",
+					"type": "float",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"mediaMeta": {
+					"name": "mediaMeta",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"video_type_created_idx": {
+					"name": "video_type_created_idx",
+					"columns": ["videoId", "type", "createdAt", "id"],
+					"isUnique": false
+				},
+				"author_id_idx": {
+					"name": "author_id_idx",
+					"columns": ["authorId"],
+					"isUnique": false
+				},
+				"parent_comment_id_idx": {
+					"name": "parent_comment_id_idx",
+					"columns": ["parentCommentId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"comments_id": {
+					"name": "comments_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"developer_api_keys": {
+			"name": "developer_api_keys",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"appId": {
+					"name": "appId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"keyType": {
+					"name": "keyType",
+					"type": "varchar(8)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"keyPrefix": {
+					"name": "keyPrefix",
+					"type": "varchar(12)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"keyHash": {
+					"name": "keyHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"encryptedKey": {
+					"name": "encryptedKey",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"lastUsedAt": {
+					"name": "lastUsedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"revokedAt": {
+					"name": "revokedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"key_hash_idx": {
+					"name": "key_hash_idx",
+					"columns": ["keyHash"],
+					"isUnique": true
+				},
+				"app_key_type_idx": {
+					"name": "app_key_type_idx",
+					"columns": ["appId", "keyType"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"developer_api_keys_appId_developer_apps_id_fk": {
+					"name": "developer_api_keys_appId_developer_apps_id_fk",
+					"tableFrom": "developer_api_keys",
+					"tableTo": "developer_apps",
+					"columnsFrom": ["appId"],
+					"columnsTo": ["id"],
+					"onDelete": "no action",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"developer_api_keys_id": {
+					"name": "developer_api_keys_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"developer_app_domains": {
+			"name": "developer_app_domains",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"appId": {
+					"name": "appId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"domain": {
+					"name": "domain",
+					"type": "varchar(253)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {},
+			"foreignKeys": {
+				"developer_app_domains_appId_developer_apps_id_fk": {
+					"name": "developer_app_domains_appId_developer_apps_id_fk",
+					"tableFrom": "developer_app_domains",
+					"tableTo": "developer_apps",
+					"columnsFrom": ["appId"],
+					"columnsTo": ["id"],
+					"onDelete": "no action",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"developer_app_domains_id": {
+					"name": "developer_app_domains_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {
+				"app_domain_unique": {
+					"name": "app_domain_unique",
+					"columns": ["appId", "domain"]
+				}
+			},
+			"checkConstraint": {}
+		},
+		"developer_apps": {
+			"name": "developer_apps",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"environment": {
+					"name": "environment",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"logoUrl": {
+					"name": "logoUrl",
+					"type": "varchar(1024)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"deletedAt": {
+					"name": "deletedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"owner_deleted_idx": {
+					"name": "owner_deleted_idx",
+					"columns": ["ownerId", "deletedAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"developer_apps_id": {
+					"name": "developer_apps_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"developer_credit_accounts": {
+			"name": "developer_credit_accounts",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"appId": {
+					"name": "appId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"balanceMicroCredits": {
+					"name": "balanceMicroCredits",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"stripeCustomerId": {
+					"name": "stripeCustomerId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"stripePaymentMethodId": {
+					"name": "stripePaymentMethodId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"autoTopUpEnabled": {
+					"name": "autoTopUpEnabled",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				},
+				"autoTopUpThresholdMicroCredits": {
+					"name": "autoTopUpThresholdMicroCredits",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"autoTopUpAmountCents": {
+					"name": "autoTopUpAmountCents",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"app_id_unique": {
+					"name": "app_id_unique",
+					"columns": ["appId"],
+					"isUnique": true
+				}
+			},
+			"foreignKeys": {
+				"developer_credit_accounts_appId_developer_apps_id_fk": {
+					"name": "developer_credit_accounts_appId_developer_apps_id_fk",
+					"tableFrom": "developer_credit_accounts",
+					"tableTo": "developer_apps",
+					"columnsFrom": ["appId"],
+					"columnsTo": ["id"],
+					"onDelete": "no action",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"developer_credit_accounts_id": {
+					"name": "developer_credit_accounts_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"developer_credit_transactions": {
+			"name": "developer_credit_transactions",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"accountId": {
+					"name": "accountId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"type": {
+					"name": "type",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"amountMicroCredits": {
+					"name": "amountMicroCredits",
+					"type": "bigint",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"balanceAfterMicroCredits": {
+					"name": "balanceAfterMicroCredits",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"referenceId": {
+					"name": "referenceId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"referenceType": {
+					"name": "referenceType",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"metadata": {
+					"name": "metadata",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"account_type_created_idx": {
+					"name": "account_type_created_idx",
+					"columns": ["accountId", "type", "createdAt"],
+					"isUnique": false
+				},
+				"account_ref_dedup_idx": {
+					"name": "account_ref_dedup_idx",
+					"columns": ["accountId", "referenceId", "referenceType"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"dev_credit_txn_account_fk": {
+					"name": "dev_credit_txn_account_fk",
+					"tableFrom": "developer_credit_transactions",
+					"tableTo": "developer_credit_accounts",
+					"columnsFrom": ["accountId"],
+					"columnsTo": ["id"],
+					"onDelete": "no action",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"developer_credit_transactions_id": {
+					"name": "developer_credit_transactions_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"developer_daily_storage_snapshots": {
+			"name": "developer_daily_storage_snapshots",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"appId": {
+					"name": "appId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"snapshotDate": {
+					"name": "snapshotDate",
+					"type": "varchar(10)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"totalDurationMinutes": {
+					"name": "totalDurationMinutes",
+					"type": "float",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"videoCount": {
+					"name": "videoCount",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"microCreditsCharged": {
+					"name": "microCreditsCharged",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"processedAt": {
+					"name": "processedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {},
+			"foreignKeys": {
+				"developer_daily_storage_snapshots_appId_developer_apps_id_fk": {
+					"name": "developer_daily_storage_snapshots_appId_developer_apps_id_fk",
+					"tableFrom": "developer_daily_storage_snapshots",
+					"tableTo": "developer_apps",
+					"columnsFrom": ["appId"],
+					"columnsTo": ["id"],
+					"onDelete": "no action",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"developer_daily_storage_snapshots_id": {
+					"name": "developer_daily_storage_snapshots_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {
+				"app_date_unique": {
+					"name": "app_date_unique",
+					"columns": ["appId", "snapshotDate"]
+				}
+			},
+			"checkConstraint": {}
+		},
+		"developer_videos": {
+			"name": "developer_videos",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"appId": {
+					"name": "appId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"externalUserId": {
+					"name": "externalUserId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'Untitled'"
+				},
+				"duration": {
+					"name": "duration",
+					"type": "float",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"width": {
+					"name": "width",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"height": {
+					"name": "height",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"fps": {
+					"name": "fps",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"s3Key": {
+					"name": "s3Key",
+					"type": "varchar(512)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"transcriptionStatus": {
+					"name": "transcriptionStatus",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"metadata": {
+					"name": "metadata",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"deletedAt": {
+					"name": "deletedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"app_created_idx": {
+					"name": "app_created_idx",
+					"columns": ["appId", "createdAt"],
+					"isUnique": false
+				},
+				"app_user_idx": {
+					"name": "app_user_idx",
+					"columns": ["appId", "externalUserId"],
+					"isUnique": false
+				},
+				"app_deleted_idx": {
+					"name": "app_deleted_idx",
+					"columns": ["appId", "deletedAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"developer_videos_appId_developer_apps_id_fk": {
+					"name": "developer_videos_appId_developer_apps_id_fk",
+					"tableFrom": "developer_videos",
+					"tableTo": "developer_apps",
+					"columnsFrom": ["appId"],
+					"columnsTo": ["id"],
+					"onDelete": "no action",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"developer_videos_id": {
+					"name": "developer_videos_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"folders": {
+			"name": "folders",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"color": {
+					"name": "color",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'normal'"
+				},
+				"public": {
+					"name": "public",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				},
+				"settings": {
+					"name": "settings",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdById": {
+					"name": "createdById",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"parentId": {
+					"name": "parentId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"spaceId": {
+					"name": "spaceId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"organization_id_idx": {
+					"name": "organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": false
+				},
+				"created_by_id_idx": {
+					"name": "created_by_id_idx",
+					"columns": ["createdById"],
+					"isUnique": false
+				},
+				"parent_id_idx": {
+					"name": "parent_id_idx",
+					"columns": ["parentId"],
+					"isUnique": false
+				},
+				"space_id_idx": {
+					"name": "space_id_idx",
+					"columns": ["spaceId"],
+					"isUnique": false
+				},
+				"public_parent_id_idx": {
+					"name": "public_parent_id_idx",
+					"columns": ["public", "parentId"],
+					"isUnique": false
+				},
+				"public_space_parent_id_idx": {
+					"name": "public_space_parent_id_idx",
+					"columns": ["public", "spaceId", "parentId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"folders_id": {
+					"name": "folders_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"imported_videos": {
+			"name": "imported_videos",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"orgId": {
+					"name": "orgId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"source": {
+					"name": "source",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"source_id": {
+					"name": "source_id",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				}
+			},
+			"indexes": {},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"imported_videos_orgId_source_source_id_pk": {
+					"name": "imported_videos_orgId_source_source_id_pk",
+					"columns": ["orgId", "source", "source_id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"integration_installations": {
+			"name": "integration_installations",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"provider": {
+					"name": "provider",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"externalId": {
+					"name": "externalId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"displayName": {
+					"name": "displayName",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"installedByUserId": {
+					"name": "installedByUserId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"encryptedCredentials": {
+					"name": "encryptedCredentials",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"metadata": {
+					"name": "metadata",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"provider_external_id_idx": {
+					"name": "provider_external_id_idx",
+					"columns": ["provider", "externalId"],
+					"isUnique": true
+				},
+				"organization_provider_display_name_idx": {
+					"name": "organization_provider_display_name_idx",
+					"columns": ["organizationId", "provider", "displayName"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"integration_installations_id": {
+					"name": "integration_installations_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"messenger_conversations": {
+			"name": "messenger_conversations",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"agent": {
+					"name": "agent",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"mode": {
+					"name": "mode",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'agent'"
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"anonymousId": {
+					"name": "anonymousId",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"takeoverByUserId": {
+					"name": "takeoverByUserId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"takeoverAt": {
+					"name": "takeoverAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"lastMessageAt": {
+					"name": "lastMessageAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"user_last_message_idx": {
+					"name": "user_last_message_idx",
+					"columns": ["userId", "lastMessageAt"],
+					"isUnique": false
+				},
+				"anonymous_last_message_idx": {
+					"name": "anonymous_last_message_idx",
+					"columns": ["anonymousId", "lastMessageAt"],
+					"isUnique": false
+				},
+				"mode_last_message_idx": {
+					"name": "mode_last_message_idx",
+					"columns": ["mode", "lastMessageAt"],
+					"isUnique": false
+				},
+				"updated_at_idx": {
+					"name": "updated_at_idx",
+					"columns": ["updatedAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"messenger_conversations_id": {
+					"name": "messenger_conversations_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"messenger_messages": {
+			"name": "messenger_messages",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"conversationId": {
+					"name": "conversationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"role": {
+					"name": "role",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"content": {
+					"name": "content",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"anonymousId": {
+					"name": "anonymousId",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"conversation_created_at_idx": {
+					"name": "conversation_created_at_idx",
+					"columns": ["conversationId", "createdAt"],
+					"isUnique": false
+				},
+				"role_created_at_idx": {
+					"name": "role_created_at_idx",
+					"columns": ["role", "createdAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"messenger_messages_conversationId_messenger_conversations_id_fk": {
+					"name": "messenger_messages_conversationId_messenger_conversations_id_fk",
+					"tableFrom": "messenger_messages",
+					"tableTo": "messenger_conversations",
+					"columnsFrom": ["conversationId"],
+					"columnsTo": ["id"],
+					"onDelete": "cascade",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"messenger_messages_id": {
+					"name": "messenger_messages_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"messenger_support_emails": {
+			"name": "messenger_support_emails",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"conversationId": {
+					"name": "conversationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userEmail": {
+					"name": "userEmail",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"subject": {
+					"name": "subject",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"message": {
+					"name": "message",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"support_email_user_created_at_idx": {
+					"name": "support_email_user_created_at_idx",
+					"columns": ["userId", "createdAt"],
+					"isUnique": false
+				},
+				"support_email_conversation_created_at_idx": {
+					"name": "support_email_conversation_created_at_idx",
+					"columns": ["conversationId", "createdAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"support_email_conversation_fk": {
+					"name": "support_email_conversation_fk",
+					"tableFrom": "messenger_support_emails",
+					"tableTo": "messenger_conversations",
+					"columnsFrom": ["conversationId"],
+					"columnsTo": ["id"],
+					"onDelete": "cascade",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"messenger_support_emails_id": {
+					"name": "messenger_support_emails_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"notifications": {
+			"name": "notifications",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"orgId": {
+					"name": "orgId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"recipientId": {
+					"name": "recipientId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"type": {
+					"name": "type",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"data": {
+					"name": "data",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(50)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"dedupKey": {
+					"name": "dedupKey",
+					"type": "varchar(128)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"readAt": {
+					"name": "readAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"org_id_idx": {
+					"name": "org_id_idx",
+					"columns": ["orgId"],
+					"isUnique": false
+				},
+				"type_idx": {
+					"name": "type_idx",
+					"columns": ["type"],
+					"isUnique": false
+				},
+				"read_at_idx": {
+					"name": "read_at_idx",
+					"columns": ["readAt"],
+					"isUnique": false
+				},
+				"created_at_idx": {
+					"name": "created_at_idx",
+					"columns": ["createdAt"],
+					"isUnique": false
+				},
+				"recipient_read_idx": {
+					"name": "recipient_read_idx",
+					"columns": ["recipientId", "readAt"],
+					"isUnique": false
+				},
+				"recipient_created_idx": {
+					"name": "recipient_created_idx",
+					"columns": ["recipientId", "createdAt"],
+					"isUnique": false
+				},
+				"dedup_key_idx": {
+					"name": "dedup_key_idx",
+					"columns": ["dedupKey"],
+					"isUnique": true
+				},
+				"type_recipient_created_idx": {
+					"name": "type_recipient_created_idx",
+					"columns": ["type", "recipientId", "createdAt"],
+					"isUnique": false
+				},
+				"type_recipient_video_created_idx": {
+					"name": "type_recipient_video_created_idx",
+					"columns": ["type", "recipientId", "videoId", "createdAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"notifications_id": {
+					"name": "notifications_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"organization_invites": {
+			"name": "organization_invites",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"invitedEmail": {
+					"name": "invitedEmail",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"invitedByUserId": {
+					"name": "invitedByUserId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"role": {
+					"name": "role",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"status": {
+					"name": "status",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'pending'"
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"expiresAt": {
+					"name": "expiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"organization_id_idx": {
+					"name": "organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": false
+				},
+				"invited_email_idx": {
+					"name": "invited_email_idx",
+					"columns": ["invitedEmail"],
+					"isUnique": false
+				},
+				"invited_by_user_id_idx": {
+					"name": "invited_by_user_id_idx",
+					"columns": ["invitedByUserId"],
+					"isUnique": false
+				},
+				"status_idx": {
+					"name": "status_idx",
+					"columns": ["status"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"organization_invites_id": {
+					"name": "organization_invites_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"organization_members": {
+			"name": "organization_members",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"role": {
+					"name": "role",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"hasProSeat": {
+					"name": "hasProSeat",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"organization_id_idx": {
+					"name": "organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": false
+				},
+				"user_id_organization_id_idx": {
+					"name": "user_id_organization_id_idx",
+					"columns": ["userId", "organizationId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"organization_members_id": {
+					"name": "organization_members_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"organizations": {
+			"name": "organizations",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"metadata": {
+					"name": "metadata",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"tombstoneAt": {
+					"name": "tombstoneAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"allowedEmailDomain": {
+					"name": "allowedEmailDomain",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"customDomain": {
+					"name": "customDomain",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"domainVerified": {
+					"name": "domainVerified",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"settings": {
+					"name": "settings",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"defaultVideoPassword": {
+					"name": "defaultVideoPassword",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"iconUrl": {
+					"name": "iconUrl",
+					"type": "varchar(1024)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"shareableLinkIconUrl": {
+					"name": "shareableLinkIconUrl",
+					"type": "varchar(1024)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"workosOrganizationId": {
+					"name": "workosOrganizationId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"workosConnectionId": {
+					"name": "workosConnectionId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"owner_id_tombstone_idx": {
+					"name": "owner_id_tombstone_idx",
+					"columns": ["ownerId", "tombstoneAt"],
+					"isUnique": false
+				},
+				"custom_domain_idx": {
+					"name": "custom_domain_idx",
+					"columns": ["customDomain"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"organizations_id": {
+					"name": "organizations_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"s3_buckets": {
+			"name": "s3_buckets",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"region": {
+					"name": "region",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"endpoint": {
+					"name": "endpoint",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"bucketName": {
+					"name": "bucketName",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"accessKeyId": {
+					"name": "accessKeyId",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"secretAccessKey": {
+					"name": "secretAccessKey",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"provider": {
+					"name": "provider",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "('aws')"
+				},
+				"active": {
+					"name": "active",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": true
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"owner_organization_idx": {
+					"name": "owner_organization_idx",
+					"columns": ["ownerId", "organizationId"],
+					"isUnique": false
+				},
+				"organization_id_idx": {
+					"name": "organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": false
+				},
+				"organization_active_idx": {
+					"name": "organization_active_idx",
+					"columns": ["organizationId", "active", "updatedAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"s3_buckets_id": {
+					"name": "s3_buckets_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"sessions": {
+			"name": "sessions",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"sessionToken": {
+					"name": "sessionToken",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"expires": {
+					"name": "expires",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"created_at": {
+					"name": "created_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updated_at": {
+					"name": "updated_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"session_token_idx": {
+					"name": "session_token_idx",
+					"columns": ["sessionToken"],
+					"isUnique": true
+				},
+				"user_id_idx": {
+					"name": "user_id_idx",
+					"columns": ["userId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"sessions_id": {
+					"name": "sessions_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"shared_videos": {
+			"name": "shared_videos",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"folderId": {
+					"name": "folderId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"sharedByUserId": {
+					"name": "sharedByUserId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"sharedAt": {
+					"name": "sharedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"folder_id_idx": {
+					"name": "folder_id_idx",
+					"columns": ["folderId"],
+					"isUnique": false
+				},
+				"organization_id_idx": {
+					"name": "organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": false
+				},
+				"shared_by_user_id_idx": {
+					"name": "shared_by_user_id_idx",
+					"columns": ["sharedByUserId"],
+					"isUnique": false
+				},
+				"video_id_organization_id_idx": {
+					"name": "video_id_organization_id_idx",
+					"columns": ["videoId", "organizationId"],
+					"isUnique": false
+				},
+				"video_id_folder_id_idx": {
+					"name": "video_id_folder_id_idx",
+					"columns": ["videoId", "folderId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"shared_videos_id": {
+					"name": "shared_videos_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"signed_baas": {
+			"name": "signed_baas",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"status": {
+					"name": "status",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'pending'"
+				},
+				"stripeSubscriptionId": {
+					"name": "stripeSubscriptionId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"entityName": {
+					"name": "entityName",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"entityType": {
+					"name": "entityType",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"entityAddress": {
+					"name": "entityAddress",
+					"type": "varchar(500)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"signerName": {
+					"name": "signerName",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"signerTitle": {
+					"name": "signerTitle",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"noticesEmail": {
+					"name": "noticesEmail",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"signatureData": {
+					"name": "signatureData",
+					"type": "longtext",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"signedAt": {
+					"name": "signedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"emailSentAt": {
+					"name": "emailSentAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"signed_baa_organization_id_idx": {
+					"name": "signed_baa_organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": true
+				},
+				"signed_baa_stripe_subscription_idx": {
+					"name": "signed_baa_stripe_subscription_idx",
+					"columns": ["stripeSubscriptionId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"signed_baas_id": {
+					"name": "signed_baas_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"space_members": {
+			"name": "space_members",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"spaceId": {
+					"name": "spaceId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"role": {
+					"name": "role",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'member'"
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"user_id_idx": {
+					"name": "user_id_idx",
+					"columns": ["userId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"space_members_id": {
+					"name": "space_members_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {
+				"space_id_user_id_unique": {
+					"name": "space_id_user_id_unique",
+					"columns": ["spaceId", "userId"]
+				}
+			},
+			"checkConstraint": {}
+		},
+		"space_videos": {
+			"name": "space_videos",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"spaceId": {
+					"name": "spaceId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"folderId": {
+					"name": "folderId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"addedById": {
+					"name": "addedById",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"addedAt": {
+					"name": "addedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"folder_id_idx": {
+					"name": "folder_id_idx",
+					"columns": ["folderId"],
+					"isUnique": false
+				},
+				"video_id_idx": {
+					"name": "video_id_idx",
+					"columns": ["videoId"],
+					"isUnique": false
+				},
+				"added_by_id_idx": {
+					"name": "added_by_id_idx",
+					"columns": ["addedById"],
+					"isUnique": false
+				},
+				"space_id_video_id_idx": {
+					"name": "space_id_video_id_idx",
+					"columns": ["spaceId", "videoId"],
+					"isUnique": false
+				},
+				"space_id_folder_id_idx": {
+					"name": "space_id_folder_id_idx",
+					"columns": ["spaceId", "folderId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"space_videos_id": {
+					"name": "space_videos_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"spaces": {
+			"name": "spaces",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"primary": {
+					"name": "primary",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdById": {
+					"name": "createdById",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"iconUrl": {
+					"name": "iconUrl",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"description": {
+					"name": "description",
+					"type": "varchar(1000)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"settings": {
+					"name": "settings",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"password": {
+					"name": "password",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"privacy": {
+					"name": "privacy",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'Private'"
+				},
+				"public": {
+					"name": "public",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				}
+			},
+			"indexes": {
+				"organization_id_idx": {
+					"name": "organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": false
+				},
+				"created_by_id_idx": {
+					"name": "created_by_id_idx",
+					"columns": ["createdById"],
+					"isUnique": false
+				},
+				"public_organization_id_idx": {
+					"name": "public_organization_id_idx",
+					"columns": ["public", "organizationId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"spaces_id": {
+					"name": "spaces_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"storage_integrations": {
+			"name": "storage_integrations",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"provider": {
+					"name": "provider",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"displayName": {
+					"name": "displayName",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"status": {
+					"name": "status",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'active'"
+				},
+				"active": {
+					"name": "active",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				},
+				"encryptedConfig": {
+					"name": "encryptedConfig",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"googleDriveAccessToken": {
+					"name": "googleDriveAccessToken",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"googleDriveAccessTokenExpiresAt": {
+					"name": "googleDriveAccessTokenExpiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"googleDriveTokenRefreshLeaseId": {
+					"name": "googleDriveTokenRefreshLeaseId",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"googleDriveTokenRefreshLeaseExpiresAt": {
+					"name": "googleDriveTokenRefreshLeaseExpiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"googleDriveStorageQuotaCache": {
+					"name": "googleDriveStorageQuotaCache",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"owner_provider_idx": {
+					"name": "owner_provider_idx",
+					"columns": ["ownerId", "provider"],
+					"isUnique": false
+				},
+				"owner_active_idx": {
+					"name": "owner_active_idx",
+					"columns": ["ownerId", "active"],
+					"isUnique": false
+				},
+				"organization_provider_idx": {
+					"name": "organization_provider_idx",
+					"columns": ["organizationId", "provider"],
+					"isUnique": false
+				},
+				"organization_active_idx": {
+					"name": "organization_active_idx",
+					"columns": ["organizationId", "active", "status"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"storage_integrations_id": {
+					"name": "storage_integrations_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"storage_objects": {
+			"name": "storage_objects",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"integrationId": {
+					"name": "integrationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"objectKey": {
+					"name": "objectKey",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"objectKeyHash": {
+					"name": "objectKeyHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"providerObjectId": {
+					"name": "providerObjectId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"uploadSessionUrl": {
+					"name": "uploadSessionUrl",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"uploadStatus": {
+					"name": "uploadStatus",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'pending'"
+				},
+				"contentType": {
+					"name": "contentType",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"contentLength": {
+					"name": "contentLength",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"metadata": {
+					"name": "metadata",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"integration_key_hash_idx": {
+					"name": "integration_key_hash_idx",
+					"columns": ["integrationId", "objectKeyHash"],
+					"isUnique": true
+				},
+				"integration_status_idx": {
+					"name": "integration_status_idx",
+					"columns": ["integrationId", "uploadStatus"],
+					"isUnique": false
+				},
+				"video_id_idx": {
+					"name": "video_id_idx",
+					"columns": ["videoId"],
+					"isUnique": false
+				},
+				"owner_id_idx": {
+					"name": "owner_id_idx",
+					"columns": ["ownerId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"storage_objects_integrationId_storage_integrations_id_fk": {
+					"name": "storage_objects_integrationId_storage_integrations_id_fk",
+					"tableFrom": "storage_objects",
+					"tableTo": "storage_integrations",
+					"columnsFrom": ["integrationId"],
+					"columnsTo": ["id"],
+					"onDelete": "restrict",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"storage_objects_id": {
+					"name": "storage_objects_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"users": {
+			"name": "users",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"lastName": {
+					"name": "lastName",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"email": {
+					"name": "email",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"emailVerified": {
+					"name": "emailVerified",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"image": {
+					"name": "image",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"stripeCustomerId": {
+					"name": "stripeCustomerId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"stripeSubscriptionId": {
+					"name": "stripeSubscriptionId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"thirdPartyStripeSubscriptionId": {
+					"name": "thirdPartyStripeSubscriptionId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"stripeSubscriptionStatus": {
+					"name": "stripeSubscriptionStatus",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"stripeSubscriptionPriceId": {
+					"name": "stripeSubscriptionPriceId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"preferences": {
+					"name": "preferences",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false,
+					"default": "('null')"
+				},
+				"activeOrganizationId": {
+					"name": "activeOrganizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"created_at": {
+					"name": "created_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updated_at": {
+					"name": "updated_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"onboardingSteps": {
+					"name": "onboardingSteps",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"onboarding_completed_at": {
+					"name": "onboarding_completed_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"customBucket": {
+					"name": "customBucket",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"inviteQuota": {
+					"name": "inviteQuota",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 1
+				},
+				"defaultOrgId": {
+					"name": "defaultOrgId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"authSessionVersion": {
+					"name": "authSessionVersion",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				}
+			},
+			"indexes": {
+				"email_idx": {
+					"name": "email_idx",
+					"columns": ["email"],
+					"isUnique": true
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"users_id": {
+					"name": "users_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"verification_tokens": {
+			"name": "verification_tokens",
+			"columns": {
+				"identifier": {
+					"name": "identifier",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"token": {
+					"name": "token",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"expires": {
+					"name": "expires",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"created_at": {
+					"name": "created_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updated_at": {
+					"name": "updated_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"verification_tokens_identifier": {
+					"name": "verification_tokens_identifier",
+					"columns": ["identifier"]
+				}
+			},
+			"uniqueConstraints": {
+				"verification_tokens_token_unique": {
+					"name": "verification_tokens_token_unique",
+					"columns": ["token"]
+				}
+			},
+			"checkConstraint": {}
+		},
+		"video_edits": {
+			"name": "video_edits",
+			"columns": {
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"sourceKey": {
+					"name": "sourceKey",
+					"type": "varchar(512)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"editSpec": {
+					"name": "editSpec",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {},
+			"foreignKeys": {
+				"video_edits_videoId_videos_id_fk": {
+					"name": "video_edits_videoId_videos_id_fk",
+					"tableFrom": "video_edits",
+					"tableTo": "videos",
+					"columnsFrom": ["videoId"],
+					"columnsTo": ["id"],
+					"onDelete": "cascade",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"video_edits_videoId": {
+					"name": "video_edits_videoId",
+					"columns": ["videoId"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"video_uploads": {
+			"name": "video_uploads",
+			"columns": {
+				"video_id": {
+					"name": "video_id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"uploaded": {
+					"name": "uploaded",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"total": {
+					"name": "total",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"started_at": {
+					"name": "started_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updated_at": {
+					"name": "updated_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"mode": {
+					"name": "mode",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"phase": {
+					"name": "phase",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'uploading'"
+				},
+				"processing_progress": {
+					"name": "processing_progress",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"processing_message": {
+					"name": "processing_message",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"processing_error": {
+					"name": "processing_error",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"raw_file_key": {
+					"name": "raw_file_key",
+					"type": "varchar(512)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"phase_updated_at_video_id_idx": {
+					"name": "phase_updated_at_video_id_idx",
+					"columns": ["phase", "updated_at", "video_id"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"video_uploads_video_id": {
+					"name": "video_uploads_video_id",
+					"columns": ["video_id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"videos": {
+			"name": "videos",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"orgId": {
+					"name": "orgId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'My Video'"
+				},
+				"bucket": {
+					"name": "bucket",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"storageIntegrationId": {
+					"name": "storageIntegrationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"duration": {
+					"name": "duration",
+					"type": "float",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"width": {
+					"name": "width",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"height": {
+					"name": "height",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"fps": {
+					"name": "fps",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"metadata": {
+					"name": "metadata",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"public": {
+					"name": "public",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": true
+				},
+				"settings": {
+					"name": "settings",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"transcriptionStatus": {
+					"name": "transcriptionStatus",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"source": {
+					"name": "source",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "('{\"type\":\"MediaConvert\"}')"
+				},
+				"folderId": {
+					"name": "folderId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"effectiveCreatedAt": {
+					"name": "effectiveCreatedAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false,
+					"generated": {
+						"as": "COALESCE(\n          STR_TO_DATE(JSON_UNQUOTE(JSON_EXTRACT(`metadata`, '$.customCreatedAt')), '%Y-%m-%dT%H:%i:%s.%fZ'),\n          STR_TO_DATE(JSON_UNQUOTE(JSON_EXTRACT(`metadata`, '$.customCreatedAt')), '%Y-%m-%dT%H:%i:%sZ'),\n          `createdAt`\n        )",
+						"type": "stored"
+					}
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"password": {
+					"name": "password",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"xStreamInfo": {
+					"name": "xStreamInfo",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"firstViewEmailSentAt": {
+					"name": "firstViewEmailSentAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"isScreenshot": {
+					"name": "isScreenshot",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				},
+				"awsRegion": {
+					"name": "awsRegion",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"awsBucket": {
+					"name": "awsBucket",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"videoStartTime": {
+					"name": "videoStartTime",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"audioStartTime": {
+					"name": "audioStartTime",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"jobId": {
+					"name": "jobId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"jobStatus": {
+					"name": "jobStatus",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"skipProcessing": {
+					"name": "skipProcessing",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				}
+			},
+			"indexes": {
+				"owner_id_idx": {
+					"name": "owner_id_idx",
+					"columns": ["ownerId"],
+					"isUnique": false
+				},
+				"is_public_idx": {
+					"name": "is_public_idx",
+					"columns": ["public"],
+					"isUnique": false
+				},
+				"folder_id_idx": {
+					"name": "folder_id_idx",
+					"columns": ["folderId"],
+					"isUnique": false
+				},
+				"storage_integration_id_idx": {
+					"name": "storage_integration_id_idx",
+					"columns": ["storageIntegrationId"],
+					"isUnique": false
+				},
+				"org_owner_folder_idx": {
+					"name": "org_owner_folder_idx",
+					"columns": ["orgId", "ownerId", "folderId"],
+					"isUnique": false
+				},
+				"org_effective_created_idx": {
+					"name": "org_effective_created_idx",
+					"columns": ["orgId", "effectiveCreatedAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"videos_storageIntegrationId_storage_integrations_id_fk": {
+					"name": "videos_storageIntegrationId_storage_integrations_id_fk",
+					"tableFrom": "videos",
+					"tableTo": "storage_integrations",
+					"columnsFrom": ["storageIntegrationId"],
+					"columnsTo": ["id"],
+					"onDelete": "restrict",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"videos_id": {
+					"name": "videos_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		}
+	},
+	"views": {},
+	"_meta": {
+		"schemas": {},
+		"tables": {},
+		"columns": {}
+	},
+	"internal": {
+		"tables": {},
+		"indexes": {}
+	}
+}
diff --git a/packages/database/migrations/meta/_journal.json b/packages/database/migrations/meta/_journal.json
index d5ab96235d1..def4eaa6f72 100644
--- a/packages/database/migrations/meta/_journal.json
+++ b/packages/database/migrations/meta/_journal.json
@@ -281,6 +281,13 @@
 			"when": 1787096888361,
 			"tag": "0039_magical_vermin",
 			"breakpoints": true
+		},
+		{
+			"idx": 40,
+			"version": "5",
+			"when": 1787217975605,
+			"tag": "0040_crazy_champions",
+			"breakpoints": true
 		}
 	]
 }
diff --git a/packages/database/schema.ts b/packages/database/schema.ts
index 1510b6d44e5..1793ebcb61c 100644
--- a/packages/database/schema.ts
+++ b/packages/database/schema.ts
@@ -211,7 +211,9 @@ export const organizations = mysqlTable(
 			shareableLinkUseOrganizationIcon?: boolean;
 			aiGenerationLanguage?: AiGenerationLanguage;
 			defaultPlaybackSpeed?: number;
+			defaultVideoPublic?: boolean;
 		}>(),
+		defaultVideoPassword: encryptedTextNullable("defaultVideoPassword"),
 		iconUrl: varchar("iconUrl", {
 			length: 1024,
 		}).$type<ImageUpload.ImageUrlOrKey>(),
diff --git a/packages/web-backend/src/Videos/NewVideoDefaults.ts b/packages/web-backend/src/Videos/NewVideoDefaults.ts
new file mode 100644
index 00000000000..acef078e842
--- /dev/null
+++ b/packages/web-backend/src/Videos/NewVideoDefaults.ts
@@ -0,0 +1,30 @@
+import * as Db from "@cap/database/schema";
+import { serverEnv } from "@cap/env";
+import type { Organisation } from "@cap/web-domain";
+import * as Dz from "drizzle-orm";
+import type { DbClient } from "../Database.ts";
+
+export type NewVideoDefaults = {
+	public: boolean;
+	password: string | null;
+};
+
+export async function resolveNewVideoDefaults(
+	db: DbClient,
+	orgId: Organisation.OrganisationId,
+): Promise<NewVideoDefaults> {
+	const [organization] = await db
+		.select({
+			settings: Db.organizations.settings,
+			defaultVideoPassword: Db.organizations.defaultVideoPassword,
+		})
+		.from(Db.organizations)
+		.where(Dz.eq(Db.organizations.id, orgId));
+
+	return {
+		public:
+			organization?.settings?.defaultVideoPublic ??
+			serverEnv().CAP_VIDEOS_DEFAULT_PUBLIC,
+		password: organization?.defaultVideoPassword ?? null,
+	};
+}
diff --git a/packages/web-backend/src/Videos/index.ts b/packages/web-backend/src/Videos/index.ts
index 2efc876e431..2a483a6f66d 100644
--- a/packages/web-backend/src/Videos/index.ts
+++ b/packages/web-backend/src/Videos/index.ts
@@ -9,6 +9,7 @@ import type { Schema } from "effect/Schema";
 import { Database } from "../Database.ts";
 import { Storage as StorageService } from "../Storage/index.ts";
 import { Tinybird } from "../Tinybird/index.ts";
+import { resolveNewVideoDefaults } from "./NewVideoDefaults.ts";
 import { VideosPolicy } from "./VideosPolicy.ts";
 import type { CreateVideoInput as RepoCreateVideoInput } from "./VideosRepo.ts";
 import { VideosRepo } from "./VideosRepo.ts";
@@ -477,11 +478,16 @@ export class Videos extends Effect.Service<Videos>()("Videos", {
 						},
 					)} ${now.getFullYear()}`;
 
+					const videoDefaults = yield* db.use((db) =>
+						resolveNewVideoDefaults(db, input.orgId),
+					);
+
 					const createData: RepoCreateVideoInput = {
 						ownerId: user.id,
 						orgId: input.orgId,
 						name: `Cap Recording - ${formattedDate}`,
-						public: serverEnv().CAP_VIDEOS_DEFAULT_PUBLIC,
+						public: videoDefaults.public,
+						password: videoDefaults.password ?? undefined,
 						source: { type: "webMP4" },
 						bucketId,
 						storageIntegrationId,
diff --git a/packages/web-backend/src/index.ts b/packages/web-backend/src/index.ts
index 4ded8a58b37..8c76fed0b0c 100644
--- a/packages/web-backend/src/index.ts
+++ b/packages/web-backend/src/index.ts
@@ -39,6 +39,10 @@ export {
 	type ViewerSettings,
 } from "./Videos/EffectiveVideoRules.ts";
 export { findScreenshotObjectKey, Videos } from "./Videos/index.ts";
+export {
+	type NewVideoDefaults,
+	resolveNewVideoDefaults,
+} from "./Videos/NewVideoDefaults.ts";
 export {
 	buildCanView,
 	VideosPolicy,
diff --git a/packages/web-domain/src/Agent.ts b/packages/web-domain/src/Agent.ts
index 991f058a839..60f3db9a9b1 100644
--- a/packages/web-domain/src/Agent.ts
+++ b/packages/web-domain/src/Agent.ts
@@ -591,6 +591,7 @@ export const AgentOrganizationSettings = Schema.Struct({
 	shareableLinkUseOrganizationIcon: Schema.NullOr(Schema.Boolean),
 	aiGenerationLanguage: Schema.NullOr(AgentAiGenerationLanguage),
 	defaultPlaybackSpeed: Schema.NullOr(Schema.Number),
+	defaultVideoPublic: Schema.NullOr(Schema.Boolean),
 });
 
 export const AgentOrganization = Schema.Struct({
@@ -656,6 +657,7 @@ export const AgentOrganizationSettingsInput = Schema.Struct({
 	shareableLinkUseOrganizationIcon: Schema.optional(Schema.Boolean),
 	aiGenerationLanguage: Schema.optional(AgentAiGenerationLanguage),
 	defaultPlaybackSpeed: Schema.optional(Schema.Number),
+	defaultVideoPublic: Schema.optional(Schema.Boolean),
 });
 
 export const AgentOrganizationInviteInput = Schema.Struct({