From 703ebf75f2312b91ed2932a7bbeb5cd68d0ff456 Mon Sep 17 00:00:00 2001
From: MaheshtheDev <38828053+MaheshtheDev@users.noreply.github.com>
Date: Sun, 3 May 2026 00:23:39 +0000
Subject: [PATCH] fix: org creation (#897)

---
 apps/web/app/(app)/onboarding/page.tsx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/web/app/(app)/onboarding/page.tsx b/apps/web/app/(app)/onboarding/page.tsx
index d6711326..597b3f3f 100644
--- a/apps/web/app/(app)/onboarding/page.tsx
+++ b/apps/web/app/(app)/onboarding/page.tsx
@@ -444,13 +444,14 @@ export default function OnboardingPage() {
 
 	const ensureOrg = useCallback(async () => {
 		if (organizations && organizations.length > 0) return
-		const name = user?.name ?? user?.email ?? "My Workspace"
-		const newOrg = await authClient.organization.create({
+		const name = user?.name || user?.email || "Personal"
+		const slug = generateOrgSlug(name)
+		const result = await authClient.organization.create({
 			name,
-			slug: generateOrgSlug(name),
+			slug,
 			metadata: { signupSource: "consumer" },
 		})
-		await setActiveOrg(newOrg.slug)
+		await setActiveOrg(result.data?.slug ?? slug)
 		if (user?.name) {
 			await authClient.updateUser({
 				displayUsername: user.name,