Disable personal accounts

Register a create-organization path

dashboard: {
  user: {
    index: DASHBOARD_PREFIX,
    createOrganization: `${DASHBOARD_PREFIX}/create-organization`,
    // ...settings, ai
  },
  organization: (slug: string) => ({ /* unchanged */ }),
},

Use this constant in layout redirects, auth redirectTo / callbackURL, and leave/delete success handlers.

Split the personal dashboard so create has no product shell

Today (user)/layout.tsx always mounts the sidebar and prefetches personal billing (referenceId: user.id). For organizations-only, keep create-organization (and account settings if you want) outside the product shell.

dashboard/(user)/
  layout.tsx                      ← session required only
  create-organization/page.tsx    ← full-page create form
  settings/...                    ← optional: account security without an org
  (app)/
    layout.tsx                    ← membership guard + sidebar
    page.tsx                      ← redirect to an org (see next step)
    ai/...

Move the existing sidebar layout into (app)/layout.tsx. Parent (user)/layout.tsx only checks the session (same pattern as the onboarding recipe).

Guard access = require at least one membership

List the user's organizations with Better Auth, then redirect.

export const listOrganizations = cache(async () => {
  try {
    return await auth.api.listOrganizations({
      headers: await getHeaders(),
    });
  } catch {
    return [];
  }
});

import { redirect } from "next/navigation";

import { pathsConfig } from "~/config/paths";
import { getSession, listOrganizations } from "~/lib/auth/server";

export default async function AppShellLayout({
  children,
}: {
  children: React.ReactNode;
}) {
  const { user } = await getSession();

  if (!user) {
    return redirect(pathsConfig.auth.login);
  }

  const organizations = await listOrganizations();

  if (organizations.length === 0) {
    return redirect(pathsConfig.dashboard.user.createOrganization);
  }

  return /* existing SidebarProvider + children */;
}

On the personal home page, never render a personal product surface. Send people into an organization:

import { redirect } from "next/navigation";

import { pathsConfig } from "~/config/paths";
import { getSession, listOrganizations } from "~/lib/auth/server";

export default async function UserDashboardPage() {
  const { session } = await getSession();
  const organizations = await listOrganizations();

  if (organizations.length === 0) {
    return redirect(pathsConfig.dashboard.user.createOrganization);
  }

  const activeId = session?.activeOrganizationId;
  const active =
    organizations.find((organization) => organization.id === activeId) ??
    organizations[0];

  return redirect(pathsConfig.dashboard.organization(active.slug).index);
}

Do the same for marketing CTAs and auth success URLs that currently point at pathsConfig.dashboard.user.index. After login, /dashboard still works: it immediately redirects to an org slug.

Build the create-organization page

Reuse the existing create flow in apps/web/src/modules/organization/create-organization.tsx (getSlug → authClient.organization.create → pathsConfig.dashboard.organization(slug).index). Extract the form into a shared component, then render it full-page:

import { CreateOrganizationForm } from "~/modules/organization/create-organization-form";

export default function CreateOrganizationPage() {
  return (
    <div className="mx-auto flex min-h-[80vh] max-w-lg flex-col justify-center gap-8 px-4">
      <CreateOrganizationForm />
    </div>
  );
}

Keep the modal for creating additional organizations from the switcher. The page is only for users with zero memberships (or for a first-run step inside onboarding).

If the user already has memberships and hits this URL, redirect them to their active (or first) organization so they cannot get stuck.

Hide the personal account in the switcher

In apps/web/src/modules/organization/account-switcher.tsx, remove the personal-account CommandItem and the separator above the organizations list. The trigger should always show the active organization (never t("account.personal")).

Also stop treating "no active organization" as a valid product state in that component: if activeOrganization is missing but organizations is non-empty, navigate to the first org slug (the URL remains the source of truth; see Active organization).

Fix redirects that still assume a personal home

Search the web app for pathsConfig.dashboard.user.index in organization flows and replace the fallbacks:

Example leave success handler:

onSuccess: async () => {
  const { data } = await refetch();
  const next = data?.[0];

  toast.add({ title: t("leave.success"), type: "success" });

  router.replace(
    next
      ? pathsConfig.dashboard.organization(next.slug).index
      : pathsConfig.dashboard.user.createOrganization,
  );
},

Optional product rule: block leaving or deleting the last organization (always keep one workspace). TurboStarter already has canLeave helpers for owner/seat cases; extend that check for "last membership".

Scope billing and product data to organizations

Personal billing in (user) layouts uses referenceId: user.id. In organizations-only mode:

• Prefer the org layout billing prefetch (referenceId: activeOrganization.id) for plan gates and checkout.
• Hide or remove /dashboard/settings/billing if you no longer sell personal plans.
• Gate features with the active organization's summary, same rules as Feature-based access.

New tenant-owned tables should store organizationId, not userId, as the ownership key. User id still belongs on membership and audit columns.

Handle invites and post-auth redirects

Invitation accept already creates a membership. After accept, send the user to pathsConfig.dashboard.organization(slug).index, not personal home.

For new self-serve signups (no invitationId), point redirectTo / callbackURL at create-organization (or onboarding that includes the create step). Returning users with memberships can keep /dashboard and rely on the home redirect.

// register / login success for users without an invitation
redirectTo={pathsConfig.dashboard.user.createOrganization}

Join / invite query params already flow through apps/web/src/app/[locale]/auth/register/page.tsx and friends. Do not force create-organization when invitationId is present.

Optional: auto-create an organization on signup

If you want MakerKit-style organizations-only (no create screen), create the org as soon as the user exists, then set it active and redirect to its slug.

Practical places to do that:

1. Client after register success - call the same getSlug + organization.mutations.create path used by the modal, then router.replace to the slug.
2. Server after first authenticated dashboard hit - if listOrganizations() is empty, call auth.api.createOrganization with a derived name, then redirect.

Sketch for a server helper:

import { auth } from "@workspace/auth/server";
// reuse packages/api/src/modules/organization/queries/generate-slug.ts
// or call the same slug endpoint the create modal uses

export async function ensureDefaultOrganization(user: {
  id: string;
  name: string;
  email: string;
}) {
  const existing = await auth.api.listOrganizations({
    headers: await getHeaders(),
  });

  if (existing.length > 0) {
    return existing[0];
  }

  const name = user.name.trim() || user.email.split("@")[0] || "Workspace";
  const { slug } = await generateSlug(name);

  return auth.api.createOrganization({
    body: { name, slug },
    headers: await getHeaders(),
  });
}

Call it from the membership guard instead of redirecting to create-organization. Still offer rename in organization settings.

Verify the matrix