@@ -7,6 +7,8 @@ description: "The UI calls a customer boundary an Organization. Internal DTOs an
 
 ## Organization context
 
+Registration creates either a private Individual workspace or a Business organization. Both use the same internal `Workspace` model and tenant isolation. An Individual workspace has one member and no invitations; a Business organization supports team roles and invitations. A user may later create and switch to a separate Business organization.
+
 `IWorkspaceContextResolver` is the mandatory boundary for tenant-facing services. It starts with an authenticated identity, reloads active membership, and returns the verified `Workspace`, `WorkspaceMember`, user ID, and effective role.
 
 A client-provided organization or resource ID only identifies what the caller wants. Authorization comes from persisted membership and an organization-scoped query.
@@ -72,6 +74,7 @@ Invitations are persisted as pending `WorkspaceMember` records with:
 - expiry and send/revoke dates.
 
 Acceptance requires an authenticated Identity email matching the invitation. Expired, revoked, already active, or mismatched invitations are rejected. A pending invitation may also be promoted on a subsequent authenticated SaaS request after its email is verified.
+Individual workspaces reject invitations, including acceptance of a previously issued token.
 
 ## Tenant-owned queries
 
 
@@ -18,7 +18,7 @@ BillingSubscription ──pins──> SaasPlanVersion
 CustomerEntitlementOverride ──overrides──> feature or meter key
 ```
 
-`SaasPlan` is the durable product identity and public code. A version is an immutable commercial contract after publication. Prices, features, quotas, and trial days belong to that version.
+`SaasPlan` is the durable product identity and public code. A version is an immutable commercial contract after publication. Prices, features, quotas, trial days, and account audience belong to that version. Audience can be Both, Individual, or Business; Checkout rejects a plan whose audience does not match the active workspace kind.
 
 ## Plan lifecycle
 
 
@@ -7,7 +7,7 @@ description: "Stripe owns financial state; Next SaaS maintains a local subscript
 
 ## User behavior
 
-Customers choose a published Price from `/pricing` or `/billing`. `CreateCheckoutSession` returns a Stripe-hosted Checkout URL. After completion, the browser returns to `/billing`, which confirms the Checkout Session, while signed webhooks continue to handle future renewals, failures, portal changes, and cancellation.
+Customers choose a published Price compatible with their active Individual or Business account from `/pricing` or `/billing`. `CreateCheckoutSession` returns a Stripe-hosted Checkout URL. After completion, the browser returns to `/billing`, which confirms the Checkout Session, while signed webhooks continue to handle future renewals, failures, portal changes, and cancellation.
 
 The Stripe Customer Portal is the default UI for payment methods, invoices, cancellation, and subscription changes. The template links to Stripe-hosted invoice PDFs rather than generating duplicate tax documents.
 
 
@@ -7,10 +7,13 @@ description: "Organizations isolate customer data, subscriptions, quotas, files,
 
 ## User behavior
 
-- Registration or first SaaS access creates a personal organization when enabled.
+- Registration offers Personal and Business. Personal creates a private, single-member workspace; Business requires an organization name and starts with an owner membership. The internal account kind for Personal is `Individual`.
+- First SaaS access can still provision an Individual workspace when personal workspaces are enabled.
 - Users can create another organization with independent data and billing.
 - The application shell switches the active organization explicitly.
 - Owners and Admins invite members and manage non-owner roles.
+- Personal accounts cannot invite or accept team members; create a Business organization to collaborate.
+- New Business organizations start on shared Free with one seat; a multi-seat Business plan is needed before inviting teammates.
 - Billing members manage subscription state.
 - Ownership transfer is an explicit lifecycle operation.
 
@@ -48,7 +51,7 @@ Invitations bind a role and normalized email to a random, one-way-hashed token a
 
 ## Configuration
 
-- `Saas.EnablePersonalWorkspaces` — provision a personal organization when appropriate.
+- `Saas.EnablePersonalWorkspaces` — provision an Individual workspace when appropriate.
 - `Saas.DefaultPlan` — initial published plan code.
 - `Saas.InvitationExpiryDays` — invitation lifetime.
 - `Product` — deployment-wide brand/contact information, not customer profile data.
 
@@ -11,7 +11,7 @@ Only platform Admin users manage the catalog from the **Plans** tab at `/admin/p
 
 1. Select a durable `SaasPlan`.
 2. Edit or create its draft `SaasPlanVersion`.
-3. Configure public visibility, description, order, contact-sales behavior, and trial days.
+3. Configure account audience, public visibility, description, order, contact-sales behavior, and trial days.
 4. Add monthly/annual `SaasPlanPrice` rows, feature grants, and quota allowances.
 5. Optionally create missing Products and Prices in Stripe.
 6. Save, review active-subscription impact, and publish.
@@ -30,7 +30,7 @@ Publishing retires the prior published version. Existing subscriptions remain pi
 
 ![Immutable Plan Versions and Historical Pinning](/img/next-saas/plan-versions.png)
 
-`MyApp/plans.json` seeds these records only for an empty database.
+`MyApp/plans.json` seeds these records only for an empty database. The default catalog includes shared Free, Individual-only Personal, and Business-only Pro, Business, and Enterprise plans. Plan audience is part of each published version's contract.
 
 ## APIs
 
@@ -44,11 +44,11 @@ Publishing retires the prior published version. Existing subscriptions remain pi
 
 Amounts are integer minor currency units. Supported currencies are defined globally by `Saas.SupportedCurrencies`; annual billing is globally controlled by `Saas.EnableAnnualBilling`.
 
-A self-service paid Price must be active, positive, published, and mapped to a Stripe `price_...` identifier. Free plans require no Stripe Price. Contact-sales plans intentionally bypass self-service Checkout.
+A self-service paid Price must be active, positive, published, available to the active account kind, and mapped to a Stripe `price_...` identifier. Free plans require no Stripe Price. Contact-sales plans intentionally bypass self-service Checkout. The pricing page offers Personal and Business plan tabs above the cards, with monthly/annual billing alongside; signed-in Checkout remains bound to the active workspace kind.
 
 ![Multi-Currency and Interval Plan Prices](/img/next-saas/plan-prices.png)
 
-Stripe catalog provisioning uses plan metadata and idempotency keys. It saves returned Price mappings directly into the draft but never publishes a plan automatically. Live provisioning requires explicit opt-in.
+**Create missing in Stripe** saves the current plan as a draft when needed, including unsaved edits, before provisioning. Stripe catalog provisioning uses plan metadata and idempotency keys. It saves returned Price mappings directly into the draft but never publishes a plan automatically. Live provisioning requires explicit opt-in.
 
 ## Trials
 
 
@@ -35,11 +35,10 @@ Sign in as `admin@email.com`, open the **Plans** tab at `/admin/plans`, and repe
 
 1. Select the plan.
 2. Open its pricing configuration.
-3. Create or edit a draft.
-4. Confirm monthly and annual amounts and currencies.
-5. Click **Create missing in Stripe**.
-6. Review the returned `price_...` mappings.
-7. Publish the draft. The mappings are saved automatically, so no second draft save is required.
+3. Confirm monthly and annual amounts and currencies, editing them if needed.
+4. Click **Create missing in Stripe**. This saves a draft automatically when needed, then provisions the Stripe catalog.
+5. Review the returned `price_...` mappings.
+6. Publish the draft. The mappings are saved automatically, so no second draft save is required.
 
 Free and contact-sales plans are skipped. Published subscriptions remain pinned to their existing plan version; publishing a new draft does not silently rewrite customer contracts.
 
 
@@ -70,9 +70,9 @@ The first Development start with no application database:
 
 1. creates the ASP.NET Core Identity schema;
 2. runs the OrmLite SaaS migrations;
-3. seeds Free, Pro, Business, and Enterprise plans;
+3. seeds Free, Personal, Pro, Business, and Enterprise plans;
 4. creates development users;
-5. creates a personal organization and Free subscription when a seeded user first signs in.
+5. creates an Individual workspace and Free subscription when a seeded user first signs in.
 
 ## Development accounts
 
 
@@ -70,6 +70,7 @@ Configuration follows the `Configure.*.cs` convention:
 
 - `app/page.tsx` and `app/(content)` provide the public site and Markdown-backed content routes.
 - `app/dashboard`, `documents`, `usage`, `billing`, `team`, and `settings` are customer pages.
+- `app/signup` offers Personal and Business account types; `app/pricing` lets visitors switch between their plan catalogs above the plan cards, alongside the monthly/annual billing selector.
 - `app/admin` contains the role-gated, static Operations Center routes.
 - `components/app-shell.tsx` switches between organization navigation and capability-aware Operations Center navigation.
 - `components/admin-center-page.tsx` composes the shared heading and focused content for each operator route.
 
@@ -13,7 +13,7 @@ Required production values are publishable key, secret/restricted key, and webho
 POST https://your-host/stripe/webhook
 ```
 
-Provision Products and recurring Prices from the plan draft UI only when catalog provisioning policy allows it. Automatic live provisioning is disabled by default. Verify currency, interval, amount, trial policy, and metadata before publishing a plan.
+Provision Products and recurring Prices from the plan editor only when catalog provisioning policy allows it. The button saves a draft first when needed, including unsaved edits. Automatic live provisioning is disabled by default. Verify currency, interval, amount, trial policy, and metadata before publishing a plan.
 
 Operational checks:
 
 
@@ -231,7 +231,7 @@ kamal accessory exec postgres --reuse -d postgres \
   "psql --username postgres --dbname next_saas --command='select \"Code\", \"Name\" from \"SaasPlan\" order by \"DisplayOrder\";'"
 ```
 
-The schema must contain the Identity and SaaS tables. The plan query must return Free, Pro, Business, and Enterprise.
+The schema must contain the Identity and SaaS tables. The plan query must return Free, Personal, Pro, Business, and Enterprise.
 
 Verify both public health endpoints:
 
@@ -245,7 +245,7 @@ Both responses must be `Healthy`.
 
 ## 8. Verify clean application and Stripe state
 
-Sign in with the temporary bootstrap administrator. Confirm `/admin`, `/admin/plans`, and the public pricing page load. Create a disposable customer user and confirm a new personal organization is created.
+Sign in with the temporary bootstrap administrator. Confirm `/admin`, `/admin/plans`, and the public pricing page load. Create a disposable Individual customer user and confirm a private workspace is created. Create a Business customer user and confirm a named organization is created.
 
 The new PostgreSQL database must not contain users, organizations, subscriptions, usage records, or Stripe mappings from the retired deployment.