diff --git a/apps/web/components/settings/account.tsx b/apps/web/components/settings/account.tsx
index 57d356fc..6db42156 100644
--- a/apps/web/components/settings/account.tsx
+++ b/apps/web/components/settings/account.tsx
@@ -617,9 +617,17 @@ export default function Account() {
 				</div>
 			</section>
 
-			{canManageTeam && <OrgContext />}
-
-			{canManageTeam && isCompanyBrain && <WorkspacePersona />}
+			{canManageTeam && (
+				<div className="flex flex-col gap-5">
+					<OrgContext />
+					{isCompanyBrain && (
+						<>
+							<div aria-hidden="true" className="mx-1 h-px bg-white/[0.055]" />
+							<WorkspacePersona key={org?.id} />
+						</>
+					)}
+				</div>
+			)}
 
 			<DigestPreferences />
 
diff --git a/apps/web/hooks/use-org-settings.ts b/apps/web/hooks/use-org-settings.ts
index 374090fe..4ee1e4b6 100644
--- a/apps/web/hooks/use-org-settings.ts
+++ b/apps/web/hooks/use-org-settings.ts
@@ -54,14 +54,15 @@ export function useUpdateOrgSettings() {
 				body: settings,
 			})
 			if (response.error) {
-				throw new Error("Failed to save settings", {
-					cause: response.error.message,
+				throw new Error(response.error.message || "Failed to save settings", {
+					cause: response.error,
 				})
 			}
 			return response.data
 		},
-		onSuccess: async (data) => {
-			const queryKey = ["settings", "org", orgId] as const
+		onMutate: () => ({ orgId }),
+		onSuccess: async (data, _settings, mutationContext) => {
+			const queryKey = ["settings", "org", mutationContext.orgId] as const
 			const canonicalSettings = data?.settings
 			if (canonicalSettings) {
 				queryClient.setQueryData<OrgSettings>(queryKey, (current) =>
diff --git a/packages/lib/api.ts b/packages/lib/api.ts
index 4dc73327..63d727f0 100644
--- a/packages/lib/api.ts
+++ b/packages/lib/api.ts
@@ -34,7 +34,7 @@ const SettingsResponseSchema = z.object({
 	message: z.string(),
 	settings: z.object({
 		excludeItems: z.array(z.string().min(1).max(20)).nullable().optional(),
-		filterPrompt: z.string().min(1).max(750).nullable().optional(),
+		filterPrompt: z.string().max(750).nullable().optional(),
 		includeItems: z.array(z.string().min(1).max(20)).nullable().optional(),
 		shouldLLMFilter: z.boolean().optional(),
 		workspacePersona: z.string().max(1500).nullable().optional(),