diff --git a/frontend/TENANT_ONBOARDING_PLAN.md b/frontend/TENANT_ONBOARDING_PLAN.md
new file mode 100644
index 0000000..cd6b4f3
--- /dev/null
+++ b/frontend/TENANT_ONBOARDING_PLAN.md
@@ -0,0 +1,227 @@
+# Tenant Invitation & Custom Onboarding Flow
+
+## Overview
+
+Replace the current "Create Tenant" modal with an invitation-based flow:
+1. Platform admin sends invitation with custom permissions/limits
+2. Invited owner receives email with onboarding link
+3. Owner completes multi-step onboarding wizard
+4. Tenant is fully provisioned with custom settings
+
+## Part 1: Backend - TenantInvitation Model
+
+### New Model: `TenantInvitation` (in `platform_admin/models.py`)
+
+```python
+class TenantInvitation(models.Model):
+    """
+    Invitation for new business owners to create their tenant.
+    Allows platform admins to pre-configure custom limits and permissions.
+    """
+
+    class Status(models.TextChoices):
+        PENDING = 'PENDING', 'Pending'
+        ACCEPTED = 'ACCEPTED', 'Accepted'
+        EXPIRED = 'EXPIRED', 'Expired'
+        CANCELLED = 'CANCELLED', 'Cancelled'
+
+    # Invitation target
+    email = models.EmailField()
+    token = models.CharField(max_length=64, unique=True)
+    status = models.CharField(max_length=20, choices=Status.choices, default=Status.PENDING)
+
+    # Pre-configured business name (optional, owner can change during onboarding)
+    suggested_business_name = models.CharField(max_length=100, blank=True)
+
+    # Custom subscription settings (overrides tier defaults)
+    subscription_tier = models.CharField(max_length=50, default='PROFESSIONAL')
+    custom_max_users = models.IntegerField(null=True, blank=True)  # null = use tier default
+    custom_max_resources = models.IntegerField(null=True, blank=True)
+
+    # Platform permissions (what features this tenant can access)
+    permissions = models.JSONField(default=dict, blank=True)
+    # Example permissions:
+    # {
+    #   "can_manage_oauth_credentials": true,
+    #   "can_accept_payments": true,
+    #   "can_use_custom_domain": true,
+    #   "can_white_label": false,
+    #   "can_api_access": true,
+    # }
+
+    # Metadata
+    invited_by = models.ForeignKey('users.User', on_delete=models.SET_NULL, null=True)
+    created_at = models.DateTimeField(auto_now_add=True)
+    expires_at = models.DateTimeField()
+
+    # After acceptance
+    accepted_at = models.DateTimeField(null=True, blank=True)
+    created_tenant = models.ForeignKey('core.Tenant', null=True, blank=True, on_delete=models.SET_NULL)
+    created_user = models.ForeignKey('users.User', null=True, blank=True, on_delete=models.SET_NULL, related_name='tenant_invitation_accepted')
+```
+
+### API Endpoints
+
+1. **Create Invitation** (Platform Admin)
+   - `POST /api/platform/tenant-invitations/`
+   - Body: `{ email, suggested_business_name?, subscription_tier, custom_max_users?, custom_max_resources?, permissions }`
+   - Sends invitation email
+
+2. **List Invitations** (Platform Admin)
+   - `GET /api/platform/tenant-invitations/`
+   - Returns all invitations with status
+
+3. **Get Invitation Details** (Public - by token)
+   - `GET /api/platform/tenant-invitations/token/{token}/`
+   - Returns invitation details for onboarding page
+
+4. **Accept Invitation** (Public - by token)
+   - `POST /api/platform/tenant-invitations/token/{token}/accept/`
+   - Body: `{ password, first_name, last_name, business_name, subdomain, contact_email?, phone? }`
+   - Creates tenant, domain, and owner user
+   - Returns auth tokens for immediate login
+
+5. **Resend/Cancel** (Platform Admin)
+   - `POST /api/platform/tenant-invitations/{id}/resend/`
+   - `DELETE /api/platform/tenant-invitations/{id}/`
+
+## Part 2: Update Tenant Model
+
+Add new permission fields to `core/models.py` Tenant:
+
+```python
+# Platform-controlled permissions (copied from invitation)
+can_accept_payments = models.BooleanField(default=False)
+can_use_custom_domain = models.BooleanField(default=False)
+can_white_label = models.BooleanField(default=False)
+can_api_access = models.BooleanField(default=False)
+# ... existing can_manage_oauth_credentials
+```
+
+## Part 3: Frontend - Simplified Create Modal
+
+Replace current create modal with invitation form:
+
+### PlatformBusinesses.tsx - New "Invite Tenant" Modal
+
+**Fields:**
+- Email address (required)
+- Suggested business name (optional)
+- Subscription tier dropdown
+- Custom limits section (toggle to override):
+  - Max users (number input)
+  - Max resources (number input)
+- Platform permissions (toggles):
+  - Can manage OAuth credentials
+  - Can accept payments
+  - Can use custom domain
+  - Can white-label
+  - Can use API
+
+**Actions:**
+- Send Invitation button
+- Shows success message with "Invitation sent to {email}"
+
+## Part 4: Frontend - Onboarding Wizard
+
+### New Page: `/tenant-onboard` (TenantOnboardPage.tsx)
+
+Multi-step wizard triggered when owner clicks email link:
+
+**Step 1: Welcome & Account Setup**
+- Display: "You've been invited to create a business on SmoothSchedule"
+- Show: Invited email, tier, what permissions they'll have
+- Form: Password, Confirm Password
+- First Name, Last Name
+
+**Step 2: Business Details**
+- Business Name (pre-filled from invitation if provided)
+- Subdomain (auto-generated from name, editable)
+- Contact Email (pre-filled from invitation email)
+- Phone (optional)
+
+**Step 3: Payment Setup (conditional)**
+- Only shown if `can_accept_payments` permission is true
+- Stripe Connect embedded onboarding
+- Skip option available
+
+**Step 4: Complete**
+- Summary of what was created
+- "Go to Dashboard" button
+
+### Route Setup
+
+```tsx
+// App.tsx
+<Route path="/tenant-onboard" element={<TenantOnboardPage />} />
+```
+
+## Part 5: Email Template
+
+```
+Subject: You're invited to create your business on SmoothSchedule
+
+Hi,
+
+{inviter_name} from SmoothSchedule has invited you to create your own business account.
+
+Your plan: {tier}
+Features included:
+- Up to {max_users} team members
+- Up to {max_resources} resources
+{if can_accept_payments}- Accept online payments{/if}
+{if can_use_custom_domain}- Custom domain support{/if}
+
+Click the link below to get started:
+{onboarding_url}
+
+This invitation expires in 7 days.
+
+Thanks,
+The SmoothSchedule Team
+```
+
+## Implementation Order
+
+1. **Backend Model & Migration**
+   - Create TenantInvitation model
+   - Add new permission fields to Tenant model
+   - Run migrations
+
+2. **Backend API Endpoints**
+   - Create/list/cancel invitation endpoints
+   - Public token lookup and accept endpoints
+   - Email sending
+
+3. **Frontend - Update Create Modal**
+   - Replace current form with invitation form
+   - Add invitation list/status to businesses view
+
+4. **Frontend - Onboarding Wizard**
+   - Create TenantOnboardPage component
+   - Multi-step form with validation
+   - Conditional Stripe Connect step
+   - Route configuration
+
+5. **Testing**
+   - E2E test for full flow
+   - Unit tests for API endpoints
+
+## Files to Create/Modify
+
+### Backend
+- `smoothschedule/platform_admin/models.py` (new - TenantInvitation)
+- `smoothschedule/core/models.py` (modify - add permissions)
+- `smoothschedule/core/migrations/0007_*.py` (new - permissions)
+- `smoothschedule/platform_admin/migrations/0001_*.py` (new - TenantInvitation)
+- `smoothschedule/platform_admin/serializers.py` (modify - add invitation serializers)
+- `smoothschedule/platform_admin/views.py` (modify - add invitation viewset)
+- `smoothschedule/platform_admin/urls.py` (modify - add invitation routes)
+
+### Frontend
+- `src/api/platform.ts` (modify - add invitation API)
+- `src/hooks/usePlatform.ts` (modify - add invitation hooks)
+- `src/pages/platform/PlatformBusinesses.tsx` (modify - replace create modal)
+- `src/pages/TenantOnboardPage.tsx` (new - onboarding wizard)
+- `src/App.tsx` (modify - add route)
+- `src/i18n/locales/en.json` (modify - add translations)
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 69d0160..60de0ba 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -54,6 +54,7 @@ import ProfileSettings from './pages/ProfileSettings';
 import VerifyEmail from './pages/VerifyEmail';
 import EmailVerificationRequired from './pages/EmailVerificationRequired';
 import AcceptInvitePage from './pages/AcceptInvitePage';
+import TenantOnboardPage from './pages/TenantOnboardPage';
 
 const queryClient = new QueryClient({
   defaultOptions: {
@@ -212,6 +213,7 @@ const AppContent: React.FC = () => {
         <Route path="/oauth/callback/:provider" element={<OAuthCallback />} />
         <Route path="/verify-email" element={<VerifyEmail />} />
         <Route path="/accept-invite" element={<AcceptInvitePage />} />
+        <Route path="/tenant-onboard" element={<TenantOnboardPage />} />
         <Route path="*" element={<Navigate to="/" replace />} />
       </Routes>
     );
@@ -225,6 +227,7 @@ const AppContent: React.FC = () => {
         <Route path="/oauth/callback/:provider" element={<OAuthCallback />} />
         <Route path="/verify-email" element={<VerifyEmail />} />
         <Route path="/accept-invite" element={<AcceptInvitePage />} />
+        <Route path="/tenant-onboard" element={<TenantOnboardPage />} />
         <Route path="*" element={<Navigate to="/login" replace />} />
       </Routes>
     );
diff --git a/frontend/src/api/business.ts b/frontend/src/api/business.ts
index 831ee17..326208a 100644
--- a/frontend/src/api/business.ts
+++ b/frontend/src/api/business.ts
@@ -3,7 +3,7 @@
  */
 
 import apiClient from './client';
-import { User, Resource, BusinessOAuthSettings, BusinessOAuthSettingsResponse, BusinessOAuthCredentials } from '../types';
+import { User, Resource, BusinessOAuthSettings, BusinessOAuthSettingsResponse, BusinessOAuthCredentialsResponse } from '../types';
 
 /**
  * Get all resources for the current business
@@ -26,20 +26,27 @@ export const getBusinessUsers = async (): Promise<User[]> => {
  */
 export const getBusinessOAuthSettings = async (): Promise<BusinessOAuthSettingsResponse> => {
   const response = await apiClient.get<{
-    business_settings: {
-      oauth_enabled_providers: string[];
-      oauth_allow_registration: boolean;
-      oauth_auto_link_by_email: boolean;
+    settings: {
+      enabled_providers: string[];
+      allow_registration: boolean;
+      auto_link_by_email: boolean;
+      use_custom_credentials: boolean;
     };
-    available_providers: string[];
+    available_providers: Array<{
+      id: string;
+      name: string;
+      icon: string;
+      description: string;
+    }>;
   }>('/api/business/oauth-settings/');
 
   // Transform snake_case to camelCase
   return {
-    businessSettings: {
-      enabledProviders: response.data.business_settings.oauth_enabled_providers || [],
-      allowRegistration: response.data.business_settings.oauth_allow_registration,
-      autoLinkByEmail: response.data.business_settings.oauth_auto_link_by_email,
+    settings: {
+      enabledProviders: response.data.settings.enabled_providers || [],
+      allowRegistration: response.data.settings.allow_registration,
+      autoLinkByEmail: response.data.settings.auto_link_by_email,
+      useCustomCredentials: response.data.settings.use_custom_credentials,
     },
     availableProviders: response.data.available_providers || [],
   };
@@ -55,30 +62,40 @@ export const updateBusinessOAuthSettings = async (
   const backendData: Record<string, any> = {};
 
   if (settings.enabledProviders !== undefined) {
-    backendData.oauth_enabled_providers = settings.enabledProviders;
+    backendData.enabled_providers = settings.enabledProviders;
   }
   if (settings.allowRegistration !== undefined) {
-    backendData.oauth_allow_registration = settings.allowRegistration;
+    backendData.allow_registration = settings.allowRegistration;
   }
   if (settings.autoLinkByEmail !== undefined) {
-    backendData.oauth_auto_link_by_email = settings.autoLinkByEmail;
+    backendData.auto_link_by_email = settings.autoLinkByEmail;
+  }
+  if (settings.useCustomCredentials !== undefined) {
+    backendData.use_custom_credentials = settings.useCustomCredentials;
   }
 
   const response = await apiClient.patch<{
-    business_settings: {
-      oauth_enabled_providers: string[];
-      oauth_allow_registration: boolean;
-      oauth_auto_link_by_email: boolean;
+    settings: {
+      enabled_providers: string[];
+      allow_registration: boolean;
+      auto_link_by_email: boolean;
+      use_custom_credentials: boolean;
     };
-    available_providers: string[];
-  }>('/api/business/oauth-settings/update/', backendData);
+    available_providers: Array<{
+      id: string;
+      name: string;
+      icon: string;
+      description: string;
+    }>;
+  }>('/api/business/oauth-settings/', backendData);
 
   // Transform snake_case to camelCase
   return {
-    businessSettings: {
-      enabledProviders: response.data.business_settings.oauth_enabled_providers || [],
-      allowRegistration: response.data.business_settings.oauth_allow_registration,
-      autoLinkByEmail: response.data.business_settings.oauth_auto_link_by_email,
+    settings: {
+      enabledProviders: response.data.settings.enabled_providers || [],
+      allowRegistration: response.data.settings.allow_registration,
+      autoLinkByEmail: response.data.settings.auto_link_by_email,
+      useCustomCredentials: response.data.settings.use_custom_credentials,
     },
     availableProviders: response.data.available_providers || [],
   };
@@ -87,20 +104,51 @@ export const updateBusinessOAuthSettings = async (
 /**
  * Get business OAuth credentials (custom credentials for paid tiers)
  */
-export const getBusinessOAuthCredentials = async (): Promise<BusinessOAuthCredentials> => {
-  const response = await apiClient.get<BusinessOAuthCredentials>('/api/business/oauth-credentials/');
-  return response.data;
+export const getBusinessOAuthCredentials = async (): Promise<BusinessOAuthCredentialsResponse> => {
+  const response = await apiClient.get<{
+    credentials: Record<string, {
+      client_id: string;
+      client_secret: string;
+      has_secret: boolean;
+    }>;
+    use_custom_credentials: boolean;
+  }>('/api/business/oauth-credentials/');
+
+  return {
+    credentials: response.data.credentials || {},
+    useCustomCredentials: response.data.use_custom_credentials,
+  };
 };
 
 /**
  * Update business OAuth credentials (custom credentials for paid tiers)
  */
 export const updateBusinessOAuthCredentials = async (
-  credentials: Partial<BusinessOAuthCredentials>
-): Promise<BusinessOAuthCredentials> => {
-  const response = await apiClient.patch<BusinessOAuthCredentials>(
-    '/api/business/oauth-credentials/update/',
-    credentials
-  );
-  return response.data;
+  data: {
+    credentials?: Record<string, { client_id?: string; client_secret?: string }>;
+    useCustomCredentials?: boolean;
+  }
+): Promise<BusinessOAuthCredentialsResponse> => {
+  const backendData: Record<string, any> = {};
+
+  if (data.credentials !== undefined) {
+    backendData.credentials = data.credentials;
+  }
+  if (data.useCustomCredentials !== undefined) {
+    backendData.use_custom_credentials = data.useCustomCredentials;
+  }
+
+  const response = await apiClient.patch<{
+    credentials: Record<string, {
+      client_id: string;
+      client_secret: string;
+      has_secret: boolean;
+    }>;
+    use_custom_credentials: boolean;
+  }>('/api/business/oauth-credentials/', backendData);
+
+  return {
+    credentials: response.data.credentials || {},
+    useCustomCredentials: response.data.use_custom_credentials,
+  };
 };
diff --git a/frontend/src/api/platform.ts b/frontend/src/api/platform.ts
index 30e1699..9cff902 100644
--- a/frontend/src/api/platform.ts
+++ b/frontend/src/api/platform.ts
@@ -22,6 +22,37 @@ export interface PlatformBusiness {
   created_on: string;
   user_count: number;
   owner: PlatformBusinessOwner | null;
+  max_users: number;
+  max_resources: number;
+  contact_email?: string;
+  phone?: string;
+  // Platform permissions
+  can_manage_oauth_credentials: boolean;
+}
+
+export interface PlatformBusinessUpdate {
+  name?: string;
+  is_active?: boolean;
+  subscription_tier?: string;
+  max_users?: number;
+  max_resources?: number;
+  can_manage_oauth_credentials?: boolean;
+}
+
+export interface PlatformBusinessCreate {
+  name: string;
+  subdomain: string;
+  subscription_tier?: string;
+  is_active?: boolean;
+  max_users?: number;
+  max_resources?: number;
+  contact_email?: string;
+  phone?: string;
+  can_manage_oauth_credentials?: boolean;
+  // Owner details (optional)
+  owner_email?: string;
+  owner_name?: string;
+  owner_password?: string;
 }
 
 export interface PlatformUser {
@@ -48,6 +79,33 @@ export const getBusinesses = async (): Promise<PlatformBusiness[]> => {
   return response.data;
 };
 
+/**
+ * Update a business (platform admin only)
+ */
+export const updateBusiness = async (
+  businessId: number,
+  data: PlatformBusinessUpdate
+): Promise<PlatformBusiness> => {
+  const response = await apiClient.patch<PlatformBusiness>(
+    `/api/platform/businesses/${businessId}/`,
+    data
+  );
+  return response.data;
+};
+
+/**
+ * Create a new business (platform admin only)
+ */
+export const createBusiness = async (
+  data: PlatformBusinessCreate
+): Promise<PlatformBusiness> => {
+  const response = await apiClient.post<PlatformBusiness>(
+    '/api/platform/businesses/',
+    data
+  );
+  return response.data;
+};
+
 /**
  * Get all users (platform admin only)
  */
@@ -63,3 +121,137 @@ export const getBusinessUsers = async (businessId: number): Promise<PlatformUser
   const response = await apiClient.get<PlatformUser[]>(`/api/platform/users/?business=${businessId}`);
   return response.data;
 };
+
+// ============================================================================
+// Tenant Invitations
+// ============================================================================
+
+export interface TenantInvitation {
+  id: number;
+  email: string;
+  token: string;
+  status: 'PENDING' | 'ACCEPTED' | 'EXPIRED' | 'CANCELLED';
+  suggested_business_name: string;
+  subscription_tier: 'FREE' | 'STARTER' | 'PROFESSIONAL' | 'ENTERPRISE';
+  custom_max_users: number | null;
+  custom_max_resources: number | null;
+  permissions: {
+    can_manage_oauth_credentials?: boolean;
+    can_accept_payments?: boolean;
+    can_use_custom_domain?: boolean;
+    can_white_label?: boolean;
+    can_api_access?: boolean;
+  };
+  personal_message: string;
+  invited_by: number;
+  invited_by_email: string;
+  created_at: string;
+  expires_at: string;
+  accepted_at: string | null;
+  created_tenant: number | null;
+  created_tenant_name: string | null;
+  created_user: number | null;
+  created_user_email: string | null;
+}
+
+export interface TenantInvitationCreate {
+  email: string;
+  suggested_business_name?: string;
+  subscription_tier: 'FREE' | 'STARTER' | 'PROFESSIONAL' | 'ENTERPRISE';
+  custom_max_users?: number | null;
+  custom_max_resources?: number | null;
+  permissions?: {
+    can_manage_oauth_credentials?: boolean;
+    can_accept_payments?: boolean;
+    can_use_custom_domain?: boolean;
+    can_white_label?: boolean;
+    can_api_access?: boolean;
+  };
+  personal_message?: string;
+}
+
+export interface TenantInvitationDetail {
+  email: string;
+  suggested_business_name: string;
+  subscription_tier: string;
+  effective_max_users: number;
+  effective_max_resources: number;
+  permissions: {
+    can_manage_oauth_credentials?: boolean;
+    can_accept_payments?: boolean;
+    can_use_custom_domain?: boolean;
+    can_white_label?: boolean;
+    can_api_access?: boolean;
+  };
+  expires_at: string;
+}
+
+export interface TenantInvitationAccept {
+  email: string;
+  password: string;
+  first_name: string;
+  last_name: string;
+  business_name: string;
+  subdomain: string;
+  contact_email?: string;
+  phone?: string;
+}
+
+/**
+ * Get all tenant invitations (platform admin only)
+ */
+export const getTenantInvitations = async (): Promise<TenantInvitation[]> => {
+  const response = await apiClient.get<TenantInvitation[]>('/api/platform/tenant-invitations/');
+  return response.data;
+};
+
+/**
+ * Create a tenant invitation (platform admin only)
+ */
+export const createTenantInvitation = async (
+  data: TenantInvitationCreate
+): Promise<TenantInvitation> => {
+  const response = await apiClient.post<TenantInvitation>(
+    '/api/platform/tenant-invitations/',
+    data
+  );
+  return response.data;
+};
+
+/**
+ * Resend a tenant invitation (platform admin only)
+ */
+export const resendTenantInvitation = async (invitationId: number): Promise<void> => {
+  await apiClient.post(`/api/platform/tenant-invitations/${invitationId}/resend/`);
+};
+
+/**
+ * Cancel a tenant invitation (platform admin only)
+ */
+export const cancelTenantInvitation = async (invitationId: number): Promise<void> => {
+  await apiClient.post(`/api/platform/tenant-invitations/${invitationId}/cancel/`);
+};
+
+/**
+ * Get invitation details by token (public, no auth required)
+ */
+export const getInvitationByToken = async (token: string): Promise<TenantInvitationDetail> => {
+  const response = await apiClient.get<TenantInvitationDetail>(
+    `/api/platform/tenant-invitations/token/${token}/`
+  );
+  return response.data;
+};
+
+/**
+ * Accept an invitation by token (public, no auth required)
+ */
+export const acceptInvitation = async (
+  token: string,
+  data: TenantInvitationAccept
+): Promise<{ detail: string }> => {
+  const response = await apiClient.post<{ detail: string }>(
+    `/api/platform/tenant-invitations/token/${token}/accept/`,
+    data
+  );
+  return response.data;
+};
diff --git a/frontend/src/components/Sidebar.tsx b/frontend/src/components/Sidebar.tsx
index c9c8568..8f335cc 100644
--- a/frontend/src/components/Sidebar.tsx
+++ b/frontend/src/components/Sidebar.tsx
@@ -63,7 +63,9 @@ const Sidebar: React.FC<SidebarProps> = ({ business, user, isCollapsed, toggleCo
   return (
     <div
       className={`flex flex-col h-full text-white shrink-0 transition-all duration-300 ${isCollapsed ? 'w-20' : 'w-64'}`}
-      style={{ backgroundColor: business.primaryColor }}
+      style={{
+        background: `linear-gradient(to bottom right, ${business.primaryColor}, ${business.secondaryColor || business.primaryColor})`
+      }}
     >
       <button
         onClick={toggleCollapse}
diff --git a/frontend/src/hooks/useBusiness.ts b/frontend/src/hooks/useBusiness.ts
index 5610631..7fdc3f0 100644
--- a/frontend/src/hooks/useBusiness.ts
+++ b/frontend/src/hooks/useBusiness.ts
@@ -46,6 +46,8 @@ export const useCurrentBusiness = () => {
         initialSetupComplete: data.initial_setup_complete,
         websitePages: data.website_pages || {},
         customerDashboardContent: data.customer_dashboard_content || [],
+        // Platform-controlled permissions
+        canManageOAuthCredentials: data.can_manage_oauth_credentials || false,
       };
     },
   });
diff --git a/frontend/src/hooks/useBusinessOAuth.ts b/frontend/src/hooks/useBusinessOAuth.ts
index 64bb7fc..f5f9bca 100644
--- a/frontend/src/hooks/useBusinessOAuth.ts
+++ b/frontend/src/hooks/useBusinessOAuth.ts
@@ -13,6 +13,7 @@ export const useBusinessOAuthSettings = () => {
   return useQuery<BusinessOAuthSettingsResponse>({
     queryKey: ['businessOAuthSettings'],
     queryFn: getBusinessOAuthSettings,
+    retry: false, // Don't retry on 404
     staleTime: 5 * 60 * 1000, // 5 minutes
   });
 };
diff --git a/frontend/src/hooks/useBusinessOAuthCredentials.ts b/frontend/src/hooks/useBusinessOAuthCredentials.ts
index 1b35e2b..870c483 100644
--- a/frontend/src/hooks/useBusinessOAuthCredentials.ts
+++ b/frontend/src/hooks/useBusinessOAuthCredentials.ts
@@ -4,15 +4,17 @@
 
 import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
 import { getBusinessOAuthCredentials, updateBusinessOAuthCredentials } from '../api/business';
-import { BusinessOAuthCredentials } from '../types';
+import { BusinessOAuthCredentialsResponse } from '../types';
 
 /**
  * Fetch business OAuth credentials
  */
 export const useBusinessOAuthCredentials = () => {
-  return useQuery({
+  return useQuery<BusinessOAuthCredentialsResponse>({
     queryKey: ['businessOAuthCredentials'],
     queryFn: getBusinessOAuthCredentials,
+    retry: false, // Don't retry on 404
+    staleTime: 5 * 60 * 1000, // 5 minutes
   });
 };
 
@@ -23,8 +25,10 @@ export const useUpdateBusinessOAuthCredentials = () => {
   const queryClient = useQueryClient();
 
   return useMutation({
-    mutationFn: (credentials: Partial<BusinessOAuthCredentials>) =>
-      updateBusinessOAuthCredentials(credentials),
+    mutationFn: (data: {
+      credentials?: Record<string, { client_id?: string; client_secret?: string }>;
+      useCustomCredentials?: boolean;
+    }) => updateBusinessOAuthCredentials(data),
     onSuccess: (data) => {
       queryClient.setQueryData(['businessOAuthCredentials'], data);
     },
diff --git a/frontend/src/hooks/useCustomDomains.ts b/frontend/src/hooks/useCustomDomains.ts
index 7cd3427..38933d3 100644
--- a/frontend/src/hooks/useCustomDomains.ts
+++ b/frontend/src/hooks/useCustomDomains.ts
@@ -19,6 +19,8 @@ export const useCustomDomains = () => {
   return useQuery<CustomDomain[], Error>({
     queryKey: ['customDomains'],
     queryFn: getCustomDomains,
+    retry: false, // Don't retry on 404
+    staleTime: 5 * 60 * 1000, // 5 minutes
   });
 };
 
diff --git a/frontend/src/hooks/usePlatform.ts b/frontend/src/hooks/usePlatform.ts
index 4359e21..3dd1861 100644
--- a/frontend/src/hooks/usePlatform.ts
+++ b/frontend/src/hooks/usePlatform.ts
@@ -3,8 +3,24 @@
  * React Query hooks for platform-level operations
  */
 
-import { useQuery } from '@tanstack/react-query';
-import { getBusinesses, getUsers, getBusinessUsers } from '../api/platform';
+import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
+import {
+  getBusinesses,
+  getUsers,
+  getBusinessUsers,
+  updateBusiness,
+  createBusiness,
+  PlatformBusinessUpdate,
+  PlatformBusinessCreate,
+  getTenantInvitations,
+  createTenantInvitation,
+  resendTenantInvitation,
+  cancelTenantInvitation,
+  getInvitationByToken,
+  acceptInvitation,
+  TenantInvitationCreate,
+  TenantInvitationAccept
+} from '../api/platform';
 
 /**
  * Hook to get all businesses (platform admin only)
@@ -39,3 +55,116 @@ export const useBusinessUsers = (businessId: number | null) => {
     staleTime: 5 * 60 * 1000, // 5 minutes
   });
 };
+
+/**
+ * Hook to update a business (platform admin only)
+ */
+export const useUpdateBusiness = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: ({ businessId, data }: { businessId: number; data: PlatformBusinessUpdate }) =>
+      updateBusiness(businessId, data),
+    onSuccess: () => {
+      // Invalidate and refetch businesses list
+      queryClient.invalidateQueries({ queryKey: ['platform', 'businesses'] });
+    },
+  });
+};
+
+/**
+ * Hook to create a new business (platform admin only)
+ */
+export const useCreateBusiness = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: (data: PlatformBusinessCreate) => createBusiness(data),
+    onSuccess: () => {
+      // Invalidate and refetch businesses list
+      queryClient.invalidateQueries({ queryKey: ['platform', 'businesses'] });
+    },
+  });
+};
+
+// ============================================================================
+// Tenant Invitation Hooks
+// ============================================================================
+
+/**
+ * Hook to get all tenant invitations (platform admin only)
+ */
+export const useTenantInvitations = () => {
+  return useQuery({
+    queryKey: ['platform', 'tenant-invitations'],
+    queryFn: getTenantInvitations,
+    staleTime: 5 * 60 * 1000, // 5 minutes
+  });
+};
+
+/**
+ * Hook to create a tenant invitation (platform admin only)
+ */
+export const useCreateTenantInvitation = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: (data: TenantInvitationCreate) => createTenantInvitation(data),
+    onSuccess: () => {
+      // Invalidate invitations list
+      queryClient.invalidateQueries({ queryKey: ['platform', 'tenant-invitations'] });
+    },
+  });
+};
+
+/**
+ * Hook to resend a tenant invitation (platform admin only)
+ */
+export const useResendTenantInvitation = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: (invitationId: number) => resendTenantInvitation(invitationId),
+    onSuccess: () => {
+      // Invalidate invitations list
+      queryClient.invalidateQueries({ queryKey: ['platform', 'tenant-invitations'] });
+    },
+  });
+};
+
+/**
+ * Hook to cancel a tenant invitation (platform admin only)
+ */
+export const useCancelTenantInvitation = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: (invitationId: number) => cancelTenantInvitation(invitationId),
+    onSuccess: () => {
+      // Invalidate invitations list
+      queryClient.invalidateQueries({ queryKey: ['platform', 'tenant-invitations'] });
+    },
+  });
+};
+
+/**
+ * Hook to get invitation details by token (public, no auth required)
+ */
+export const useInvitationByToken = (token: string | null) => {
+  return useQuery({
+    queryKey: ['tenant-invitation', token],
+    queryFn: () => getInvitationByToken(token!),
+    enabled: !!token,
+    retry: false, // Don't retry on 404/expired invitations
+  });
+};
+
+/**
+ * Hook to accept an invitation (public, no auth required)
+ */
+export const useAcceptInvitation = () => {
+  return useMutation({
+    mutationFn: ({ token, data }: { token: string; data: TenantInvitationAccept }) =>
+      acceptInvitation(token, data),
+  });
+};
diff --git a/frontend/src/layouts/BusinessLayout.tsx b/frontend/src/layouts/BusinessLayout.tsx
index 7f3625a..c4ac758 100644
--- a/frontend/src/layouts/BusinessLayout.tsx
+++ b/frontend/src/layouts/BusinessLayout.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef } from 'react';
+import React, { useState, useEffect, useRef, useMemo } from 'react';
 import { Outlet, useLocation, useSearchParams, useNavigate } from 'react-router-dom';
 import Sidebar from '../components/Sidebar';
 import TopBar from '../components/TopBar';
@@ -10,6 +10,88 @@ import { useStopMasquerade } from '../hooks/useAuth';
 import { MasqueradeStackEntry } from '../api/auth';
 import { useScrollToTop } from '../hooks/useScrollToTop';
 
+/**
+ * Convert a hex color to HSL values
+ */
+function hexToHSL(hex: string): { h: number; s: number; l: number } {
+  // Remove # if present
+  hex = hex.replace(/^#/, '');
+
+  // Parse hex values
+  const r = parseInt(hex.substring(0, 2), 16) / 255;
+  const g = parseInt(hex.substring(2, 4), 16) / 255;
+  const b = parseInt(hex.substring(4, 6), 16) / 255;
+
+  const max = Math.max(r, g, b);
+  const min = Math.min(r, g, b);
+  let h = 0;
+  let s = 0;
+  const l = (max + min) / 2;
+
+  if (max !== min) {
+    const d = max - min;
+    s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
+
+    switch (max) {
+      case r:
+        h = ((g - b) / d + (g < b ? 6 : 0)) / 6;
+        break;
+      case g:
+        h = ((b - r) / d + 2) / 6;
+        break;
+      case b:
+        h = ((r - g) / d + 4) / 6;
+        break;
+    }
+  }
+
+  return { h: h * 360, s: s * 100, l: l * 100 };
+}
+
+/**
+ * Convert HSL values to hex color
+ */
+function hslToHex(h: number, s: number, l: number): string {
+  s /= 100;
+  l /= 100;
+
+  const c = (1 - Math.abs(2 * l - 1)) * s;
+  const x = c * (1 - Math.abs((h / 60) % 2 - 1));
+  const m = l - c / 2;
+
+  let r = 0, g = 0, b = 0;
+
+  if (h < 60) { r = c; g = x; b = 0; }
+  else if (h < 120) { r = x; g = c; b = 0; }
+  else if (h < 180) { r = 0; g = c; b = x; }
+  else if (h < 240) { r = 0; g = x; b = c; }
+  else if (h < 300) { r = x; g = 0; b = c; }
+  else { r = c; g = 0; b = x; }
+
+  const toHex = (n: number) => Math.round((n + m) * 255).toString(16).padStart(2, '0');
+  return `#${toHex(r)}${toHex(g)}${toHex(b)}`;
+}
+
+/**
+ * Generate a color palette from a base color
+ */
+function generateColorPalette(baseColor: string): Record<string, string> {
+  const { h, s } = hexToHSL(baseColor);
+
+  return {
+    50: hslToHex(h, Math.min(s, 30), 97),
+    100: hslToHex(h, Math.min(s, 40), 94),
+    200: hslToHex(h, Math.min(s, 50), 86),
+    300: hslToHex(h, Math.min(s, 60), 74),
+    400: hslToHex(h, Math.min(s, 70), 60),
+    500: hslToHex(h, s, 50),
+    600: baseColor, // Use the exact primary color for 600
+    700: hslToHex(h, s, 40),
+    800: hslToHex(h, s, 32),
+    900: hslToHex(h, s, 24),
+  };
+}
+
 interface BusinessLayoutProps {
   business: Business;
   user: User;
@@ -30,6 +112,38 @@ const BusinessLayout: React.FC<BusinessLayoutProps> = ({ business, user, darkMod
 
   useScrollToTop();
 
+  // Generate brand color palette from business primary color
+  const brandPalette = useMemo(() => {
+    return generateColorPalette(business.primaryColor || '#2563eb');
+  }, [business.primaryColor]);
+
+  // Set CSS custom properties for brand colors
+  useEffect(() => {
+    const root = document.documentElement;
+    Object.entries(brandPalette).forEach(([shade, color]) => {
+      root.style.setProperty(`--color-brand-${shade}`, color);
+    });
+
+    // Cleanup: reset to defaults when component unmounts
+    return () => {
+      const defaultColors: Record<string, string> = {
+        50: '#eff6ff',
+        100: '#dbeafe',
+        200: '#bfdbfe',
+        300: '#93c5fd',
+        400: '#60a5fa',
+        500: '#3b82f6',
+        600: '#2563eb',
+        700: '#1d4ed8',
+        800: '#1e40af',
+        900: '#1e3a8a',
+      };
+      Object.entries(defaultColors).forEach(([shade, color]) => {
+        root.style.setProperty(`--color-brand-${shade}`, color);
+      });
+    };
+  }, [brandPalette]);
+
   // Check for trial expiration and redirect
   useEffect(() => {
     // Don't check if already on trial-expired page
diff --git a/frontend/src/pages/Settings.tsx b/frontend/src/pages/Settings.tsx
index 74c4a61..cd12658 100644
--- a/frontend/src/pages/Settings.tsx
+++ b/frontend/src/pages/Settings.tsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useOutletContext } from 'react-router-dom';
 import { Business, User, CustomDomain } from '../types';
-import { Save, Globe, Palette, BookKey, Check, Sparkles, CheckCircle, Link2, AlertCircle, ExternalLink, Copy, Crown, ShieldCheck, Trash2, RefreshCw, Star, Eye, EyeOff, Key, ShoppingCart, Building2, Users, Lock, Wallet, X, Plus, Layers, Pencil } from 'lucide-react';
+import { Save, Globe, Palette, BookKey, Check, Sparkles, CheckCircle, Link2, AlertCircle, ExternalLink, Copy, Crown, ShieldCheck, Trash2, RefreshCw, Star, Eye, EyeOff, Key, ShoppingCart, Building2, Users, Lock, Wallet, X, Plus, Layers, Pencil, Upload, Image as ImageIcon } from 'lucide-react';
 import DomainPurchase from '../components/DomainPurchase';
 import { useBusinessOAuthSettings, useUpdateBusinessOAuthSettings } from '../hooks/useBusinessOAuth';
 import { useCustomDomains, useAddCustomDomain, useDeleteCustomDomain, useVerifyCustomDomain, useSetPrimaryDomain } from '../hooks/useCustomDomains';
@@ -365,6 +365,7 @@ const SettingsPage: React.FC = () => {
     enabledProviders: [] as string[],
     allowRegistration: false,
     autoLinkByEmail: true,
+    useCustomCredentials: false,
   });
 
   // Custom Domains
@@ -405,28 +406,26 @@ const SettingsPage: React.FC = () => {
 
   // Update OAuth settings when data loads
   useEffect(() => {
-    if (oauthData?.businessSettings) {
-      setOAuthSettings(oauthData.businessSettings);
+    if (oauthData?.settings) {
+      setOAuthSettings(oauthData.settings);
     }
   }, [oauthData]);
 
   // Update OAuth credentials when data loads
   useEffect(() => {
     if (oauthCredentials) {
-      setUseCustomCredentials(oauthCredentials.use_custom_credentials || false);
-      if (oauthCredentials.google || oauthCredentials.apple || oauthCredentials.facebook ||
-          oauthCredentials.linkedin || oauthCredentials.microsoft || oauthCredentials.twitter ||
-          oauthCredentials.twitch) {
-        setCredentials({
-          google: oauthCredentials.google || { client_id: '', client_secret: '' },
-          apple: oauthCredentials.apple || { client_id: '', client_secret: '', team_id: '', key_id: '' },
-          facebook: oauthCredentials.facebook || { client_id: '', client_secret: '' },
-          linkedin: oauthCredentials.linkedin || { client_id: '', client_secret: '' },
-          microsoft: oauthCredentials.microsoft || { client_id: '', client_secret: '', tenant_id: '' },
-          twitter: oauthCredentials.twitter || { client_id: '', client_secret: '' },
-          twitch: oauthCredentials.twitch || { client_id: '', client_secret: '' },
-        });
-      }
+      setUseCustomCredentials(oauthCredentials.useCustomCredentials || false);
+      // Map credentials from the response to local state
+      const creds = oauthCredentials.credentials || {};
+      setCredentials({
+        google: creds.google || { client_id: '', client_secret: '' },
+        apple: creds.apple || { client_id: '', client_secret: '', team_id: '', key_id: '' },
+        facebook: creds.facebook || { client_id: '', client_secret: '' },
+        linkedin: creds.linkedin || { client_id: '', client_secret: '' },
+        microsoft: creds.microsoft || { client_id: '', client_secret: '', tenant_id: '' },
+        twitter: creds.twitter || { client_id: '', client_secret: '' },
+        twitch: creds.twitch || { client_id: '', client_secret: '' },
+      });
     }
   }, [oauthCredentials]);
 
@@ -716,7 +715,7 @@ const SettingsPage: React.FC = () => {
               {/* Logo Upload */}
               <div className="mb-6 pb-6 border-b border-gray-200 dark:border-gray-700">
                 <h4 className="font-medium text-gray-900 dark:text-white mb-4 flex items-center gap-2">
-                  <Image size={16} className="text-blue-500" />
+                  <ImageIcon size={16} className="text-blue-500" />
                   Brand Logos
                 </h4>
                 <p className="text-sm text-gray-600 dark:text-gray-400 mb-6">
@@ -771,7 +770,7 @@ const SettingsPage: React.FC = () => {
                             : 'border-gray-300 dark:border-gray-600 text-gray-400'
                         }`}>
                           <div className="text-center">
-                            <Image size={32} className="mx-auto mb-2" />
+                            <ImageIcon size={32} className="mx-auto mb-2" />
                             <p className="text-xs">Drop image here</p>
                           </div>
                         </div>
@@ -872,7 +871,7 @@ const SettingsPage: React.FC = () => {
                             : 'border-gray-300 dark:border-gray-600 text-gray-400'
                         }`}>
                           <div className="text-center">
-                            <Image size={24} className="mx-auto mb-1" />
+                            <ImageIcon size={24} className="mx-auto mb-1" />
                             <p className="text-xs">Drop image here</p>
                           </div>
                         </div>
@@ -926,7 +925,7 @@ const SettingsPage: React.FC = () => {
                   </label>
                   <div
                     className="w-full max-w-xs p-6 rounded-xl"
-                    style={{ backgroundColor: formState.primaryColor }}
+                    style={{ background: `linear-gradient(to bottom right, ${formState.primaryColor}, ${formState.secondaryColor || formState.primaryColor})` }}
                   >
                     <div className="flex items-center gap-3">
                       {/* Logo-only mode: full width */}
@@ -1100,7 +1099,7 @@ const SettingsPage: React.FC = () => {
                 <div className="bg-gray-100 dark:bg-gray-900 rounded-xl p-3 overflow-hidden">
                   <div
                     className="rounded-t-lg p-2.5 flex items-center justify-between"
-                    style={{ backgroundColor: formState.primaryColor }}
+                    style={{ background: `linear-gradient(to bottom right, ${formState.primaryColor}, ${formState.secondaryColor || formState.primaryColor})` }}
                   >
                     <div className="flex items-center gap-2">
                       <div className="w-5 h-5 bg-white rounded font-bold text-[10px] flex items-center justify-center" style={{ color: formState.primaryColor }}>
@@ -1441,13 +1440,13 @@ const SettingsPage: React.FC = () => {
                 <div className="space-y-4">
                   <div className="grid grid-cols-2 md:grid-cols-4 gap-2">
                     {oauthData.availableProviders.map((provider) => {
-                      const isEnabled = oauthSettings.enabledProviders.includes(provider);
-                      const info = providerInfo[provider] || { name: provider, icon: '🔐' };
+                      const isEnabled = oauthSettings.enabledProviders.includes(provider.id);
+                      const info = providerInfo[provider.id] || { name: provider.name, icon: '🔐' };
                       return (
                         <button
-                          key={provider}
+                          key={provider.id}
                           type="button"
-                          onClick={() => toggleProvider(provider)}
+                          onClick={() => toggleProvider(provider.id)}
                           className={`relative p-3 rounded-lg border-2 transition-all text-left ${
                             isEnabled
                               ? 'border-brand-500 bg-brand-50 dark:bg-brand-900/20'
@@ -1515,45 +1514,30 @@ const SettingsPage: React.FC = () => {
               )}
             </section>
 
-            {/* Custom OAuth Credentials */}
+            {/* Custom OAuth Credentials - Only shown if platform has enabled this permission */}
+            {business.canManageOAuthCredentials && (
             <section className="bg-white dark:bg-gray-800 p-6 rounded-xl border border-gray-200 dark:border-gray-700 shadow-sm">
               <div className="flex items-center justify-between mb-4">
                 <div>
                   <h3 className="text-lg font-semibold text-gray-900 dark:text-white flex items-center gap-2">
                     <Key size={20} className="text-purple-500" />
                     Custom OAuth Credentials
-                    {business.plan === 'Free' && (
-                      <span className="inline-flex items-center gap-1 px-2 py-0.5 text-xs font-medium bg-amber-100 text-amber-800 dark:bg-amber-900/30 dark:text-amber-300 rounded-full">
-                        <Crown size={12} /> Pro
-                      </span>
-                    )}
                   </h3>
                   <p className="text-sm text-gray-500 dark:text-gray-400 mt-1">
                     Use your own OAuth app credentials for complete branding control
                   </p>
                 </div>
-                {business.plan !== 'Free' && (
-                  <button
-                    onClick={handleCredentialsSave}
-                    disabled={credentialsLoading || updateCredentialsMutation.isPending}
-                    className="flex items-center gap-2 px-4 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors shadow-sm font-medium text-sm disabled:opacity-50 disabled:cursor-not-allowed"
-                  >
-                    <Save size={16} />
-                    {updateCredentialsMutation.isPending ? 'Saving...' : 'Save'}
-                  </button>
-                )}
+                <button
+                  onClick={handleCredentialsSave}
+                  disabled={credentialsLoading || updateCredentialsMutation.isPending}
+                  className="flex items-center gap-2 px-4 py-2 bg-brand-600 text-white rounded-lg hover:bg-brand-700 transition-colors shadow-sm font-medium text-sm disabled:opacity-50 disabled:cursor-not-allowed"
+                >
+                  <Save size={16} />
+                  {updateCredentialsMutation.isPending ? 'Saving...' : 'Save'}
+                </button>
               </div>
 
-              {business.plan === 'Free' ? (
-                <div className="bg-gradient-to-br from-amber-50 to-orange-50 dark:from-amber-900/20 dark:to-orange-900/20 rounded-lg p-4 border border-amber-200 dark:border-amber-800">
-                  <p className="text-sm text-gray-700 dark:text-gray-300 mb-3">
-                    Upgrade to use your own OAuth credentials for custom branding and higher rate limits.
-                  </p>
-                  <button className="inline-flex items-center gap-2 px-3 py-1.5 text-sm font-medium text-white bg-gradient-to-r from-indigo-500 to-purple-500 rounded-lg hover:from-indigo-600 hover:to-purple-600 transition-all">
-                    <Crown size={14} /> View Plans
-                  </button>
-                </div>
-              ) : credentialsLoading ? (
+              {credentialsLoading ? (
                 <div className="flex items-center justify-center py-6">
                   <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-brand-600"></div>
                 </div>
@@ -1684,6 +1668,7 @@ const SettingsPage: React.FC = () => {
                 </div>
               )}
             </section>
+            )}
           </>
         )}
       </div>
@@ -1882,14 +1867,16 @@ const SettingsPage: React.FC = () => {
           <div className="flex items-center gap-3">
             <button
               onClick={handleCancel}
-              className="flex items-center gap-2 px-6 py-3 bg-gray-200 dark:bg-gray-700 text-gray-700 dark:text-gray-300 rounded-lg hover:bg-gray-300 dark:hover:bg-gray-600 transition-colors font-medium"
+              className="flex items-center gap-2 px-6 py-3 rounded-lg transition-colors font-medium border"
+              style={{ color: formState.secondaryColor, borderColor: formState.secondaryColor }}
             >
               <X size={18} />
               Cancel Changes
             </button>
             <button
               onClick={handleSave}
-              className="flex items-center gap-2 px-6 py-3 bg-blue-600 text-white rounded-lg hover:bg-blue-700 transition-colors shadow-md font-medium"
+              className="flex items-center gap-2 px-6 py-3 text-white rounded-lg transition-colors shadow-md font-medium hover:opacity-90"
+              style={{ backgroundColor: formState.primaryColor }}
             >
               <Save size={18} />
               Save Changes
diff --git a/frontend/src/pages/TenantOnboardPage.tsx b/frontend/src/pages/TenantOnboardPage.tsx
new file mode 100644
index 0000000..c7cff62
--- /dev/null
+++ b/frontend/src/pages/TenantOnboardPage.tsx
@@ -0,0 +1,527 @@
+import React, { useState, useEffect } from 'react';
+import { useSearchParams, useNavigate } from 'react-router-dom';
+import { CheckCircle, Mail, Lock, User, Building2, CreditCard, ArrowRight, ArrowLeft, Loader } from 'lucide-react';
+import { useInvitationByToken, useAcceptInvitation } from '../hooks/usePlatform';
+
+const TenantOnboardPage: React.FC = () => {
+  const [searchParams] = useSearchParams();
+  const navigate = useNavigate();
+  const token = searchParams.get('token');
+
+  const { data: invitation, isLoading, error } = useInvitationByToken(token);
+  const acceptInvitationMutation = useAcceptInvitation();
+
+  const [currentStep, setCurrentStep] = useState(1);
+  const [formData, setFormData] = useState({
+    // Step 1: Account
+    email: '',
+    password: '',
+    confirmPassword: '',
+    first_name: '',
+    last_name: '',
+    // Step 2: Business
+    business_name: '',
+    subdomain: '',
+    contact_email: '',
+    phone: '',
+  });
+  const [errors, setErrors] = useState<Record<string, string>>({});
+  const [acceptError, setAcceptError] = useState<string | null>(null);
+
+  // Pre-fill email and business name from invitation
+  useEffect(() => {
+    if (invitation) {
+      setFormData(prev => ({
+        ...prev,
+        email: invitation.email,
+        business_name: invitation.suggested_business_name || '',
+        contact_email: invitation.email,
+        subdomain: invitation.suggested_business_name
+          ? invitation.suggested_business_name.toLowerCase().replace(/[^a-z0-9-]/g, '').substring(0, 20)
+          : '',
+      }));
+    }
+  }, [invitation]);
+
+  const validateStep1 = () => {
+    const newErrors: Record<string, string> = {};
+
+    if (!formData.email.trim()) {
+      newErrors.email = 'Email is required';
+    } else if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(formData.email)) {
+      newErrors.email = 'Invalid email address';
+    }
+
+    if (!formData.password) {
+      newErrors.password = 'Password is required';
+    } else if (formData.password.length < 8) {
+      newErrors.password = 'Password must be at least 8 characters';
+    }
+
+    if (formData.password !== formData.confirmPassword) {
+      newErrors.confirmPassword = 'Passwords do not match';
+    }
+
+    if (!formData.first_name.trim()) {
+      newErrors.first_name = 'First name is required';
+    }
+
+    if (!formData.last_name.trim()) {
+      newErrors.last_name = 'Last name is required';
+    }
+
+    setErrors(newErrors);
+    return Object.keys(newErrors).length === 0;
+  };
+
+  const validateStep2 = () => {
+    const newErrors: Record<string, string> = {};
+
+    if (!formData.business_name.trim()) {
+      newErrors.business_name = 'Business name is required';
+    }
+
+    if (!formData.subdomain.trim()) {
+      newErrors.subdomain = 'Subdomain is required';
+    } else if (!/^[a-z][a-z0-9-]*$/.test(formData.subdomain)) {
+      newErrors.subdomain = 'Subdomain must start with a letter and contain only lowercase letters, numbers, and hyphens';
+    }
+
+    setErrors(newErrors);
+    return Object.keys(newErrors).length === 0;
+  };
+
+  const handleNext = () => {
+    if (currentStep === 1 && !validateStep1()) {
+      return;
+    }
+    if (currentStep === 2 && !validateStep2()) {
+      return;
+    }
+
+    // Skip payment step if not enabled
+    if (currentStep === 2 && !invitation?.permissions?.can_accept_payments) {
+      handleSubmit();
+      return;
+    }
+
+    setCurrentStep(prev => prev + 1);
+  };
+
+  const handleBack = () => {
+    setCurrentStep(prev => prev - 1);
+  };
+
+  const handleSubmit = () => {
+    if (!token) return;
+
+    setAcceptError(null);
+
+    const data = {
+      email: formData.email,
+      password: formData.password,
+      first_name: formData.first_name,
+      last_name: formData.last_name,
+      business_name: formData.business_name,
+      subdomain: formData.subdomain,
+      contact_email: formData.contact_email || formData.email,
+      phone: formData.phone || undefined,
+    };
+
+    acceptInvitationMutation.mutate(
+      { token, data },
+      {
+        onSuccess: () => {
+          setCurrentStep(4); // Go to completion step
+        },
+        onError: (error: any) => {
+          setAcceptError(
+            error.response?.data?.detail ||
+            error.response?.data?.subdomain?.[0] ||
+            error.message ||
+            'Failed to accept invitation'
+          );
+        },
+      }
+    );
+  };
+
+  if (isLoading) {
+    return (
+      <div className="min-h-screen bg-gradient-to-br from-indigo-50 to-blue-50 dark:from-gray-900 dark:to-gray-800 flex items-center justify-center">
+        <div className="text-center">
+          <Loader className="w-12 h-12 animate-spin text-indigo-600 mx-auto mb-4" />
+          <p className="text-gray-600 dark:text-gray-400">Loading invitation...</p>
+        </div>
+      </div>
+    );
+  }
+
+  if (error || !invitation) {
+    return (
+      <div className="min-h-screen bg-gradient-to-br from-indigo-50 to-blue-50 dark:from-gray-900 dark:to-gray-800 flex items-center justify-center p-4">
+        <div className="bg-white dark:bg-gray-800 rounded-xl shadow-xl p-8 max-w-md w-full text-center">
+          <div className="w-16 h-16 bg-red-100 dark:bg-red-900/30 rounded-full flex items-center justify-center mx-auto mb-4">
+            <span className="text-3xl">❌</span>
+          </div>
+          <h2 className="text-2xl font-bold text-gray-900 dark:text-white mb-2">Invalid Invitation</h2>
+          <p className="text-gray-600 dark:text-gray-400 mb-6">
+            This invitation link is invalid or has expired.
+          </p>
+          <button
+            onClick={() => navigate('/')}
+            className="px-6 py-2 bg-indigo-600 text-white rounded-lg hover:bg-indigo-700"
+          >
+            Go to Home
+          </button>
+        </div>
+      </div>
+    );
+  }
+
+  const totalSteps = invitation.permissions?.can_accept_payments ? 4 : 3;
+
+  return (
+    <div className="min-h-screen bg-gradient-to-br from-indigo-50 to-blue-50 dark:from-gray-900 dark:to-gray-800 py-12 px-4">
+      <div className="max-w-2xl mx-auto">
+        {/* Header */}
+        <div className="text-center mb-8">
+          <h1 className="text-3xl font-bold text-gray-900 dark:text-white mb-2">
+            Welcome to SmoothSchedule
+          </h1>
+          <p className="text-gray-600 dark:text-gray-400">
+            Complete your business setup to get started
+          </p>
+        </div>
+
+        {/* Progress Steps */}
+        <div className="mb-8">
+          <div className="flex items-center justify-between">
+            {[1, 2, totalSteps === 4 ? 3 : null, totalSteps].filter(Boolean).map((step, idx, arr) => (
+              <React.Fragment key={step}>
+                <div className="flex flex-col items-center">
+                  <div
+                    className={`w-10 h-10 rounded-full flex items-center justify-center ${
+                      currentStep >= (step || 0)
+                        ? 'bg-indigo-600 text-white'
+                        : 'bg-gray-300 dark:bg-gray-600 text-gray-600 dark:text-gray-400'
+                    }`}
+                  >
+                    {currentStep > (step || 0) ? <CheckCircle size={20} /> : step}
+                  </div>
+                  <span className="text-xs mt-2 text-gray-600 dark:text-gray-400">
+                    {step === 1 && 'Account'}
+                    {step === 2 && 'Business'}
+                    {step === 3 && totalSteps === 4 && 'Payment'}
+                    {step === totalSteps && 'Complete'}
+                  </span>
+                </div>
+                {idx < arr.length - 1 && (
+                  <div
+                    className={`flex-1 h-1 mx-2 ${
+                      currentStep > (step || 0) ? 'bg-indigo-600' : 'bg-gray-300 dark:bg-gray-600'
+                    }`}
+                  />
+                )}
+              </React.Fragment>
+            ))}
+          </div>
+        </div>
+
+        {/* Content Card */}
+        <div className="bg-white dark:bg-gray-800 rounded-xl shadow-xl p-8">
+          {acceptError && (
+            <div className="mb-6 p-4 bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-800 rounded-lg">
+              <p className="text-sm text-red-600 dark:text-red-400">{acceptError}</p>
+            </div>
+          )}
+
+          {/* Step 1: Account Setup */}
+          {currentStep === 1 && (
+            <div className="space-y-6">
+              <div>
+                <h2 className="text-2xl font-bold text-gray-900 dark:text-white mb-2">
+                  Create Your Account
+                </h2>
+                <p className="text-gray-600 dark:text-gray-400">
+                  You've been invited to create a <strong>{invitation.subscription_tier}</strong> business
+                  with up to {invitation.effective_max_users} users and {invitation.effective_max_resources} resources.
+                </p>
+              </div>
+
+              <div>
+                <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                  Email Address
+                </label>
+                <div className="relative">
+                  <Mail size={18} className="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400" />
+                  <input
+                    type="email"
+                    value={formData.email}
+                    readOnly
+                    className="w-full pl-10 pr-4 py-3 border border-gray-300 dark:border-gray-600 rounded-lg bg-gray-50 dark:bg-gray-700 text-gray-900 dark:text-white"
+                  />
+                </div>
+              </div>
+
+              <div className="grid grid-cols-2 gap-4">
+                <div>
+                  <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                    First Name *
+                  </label>
+                  <div className="relative">
+                    <User size={18} className="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400" />
+                    <input
+                      type="text"
+                      value={formData.first_name}
+                      onChange={(e) => setFormData({ ...formData, first_name: e.target.value })}
+                      className={`w-full pl-10 pr-4 py-3 border rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white ${
+                        errors.first_name ? 'border-red-500' : 'border-gray-300 dark:border-gray-600'
+                      }`}
+                    />
+                  </div>
+                  {errors.first_name && <p className="text-red-500 text-xs mt-1">{errors.first_name}</p>}
+                </div>
+
+                <div>
+                  <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                    Last Name *
+                  </label>
+                  <input
+                    type="text"
+                    value={formData.last_name}
+                    onChange={(e) => setFormData({ ...formData, last_name: e.target.value })}
+                    className={`w-full px-4 py-3 border rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white ${
+                      errors.last_name ? 'border-red-500' : 'border-gray-300 dark:border-gray-600'
+                    }`}
+                  />
+                  {errors.last_name && <p className="text-red-500 text-xs mt-1">{errors.last_name}</p>}
+                </div>
+              </div>
+
+              <div>
+                <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                  Password *
+                </label>
+                <div className="relative">
+                  <Lock size={18} className="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400" />
+                  <input
+                    type="password"
+                    value={formData.password}
+                    onChange={(e) => setFormData({ ...formData, password: e.target.value })}
+                    className={`w-full pl-10 pr-4 py-3 border rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white ${
+                      errors.password ? 'border-red-500' : 'border-gray-300 dark:border-gray-600'
+                    }`}
+                    placeholder="Min. 8 characters"
+                  />
+                </div>
+                {errors.password && <p className="text-red-500 text-xs mt-1">{errors.password}</p>}
+              </div>
+
+              <div>
+                <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                  Confirm Password *
+                </label>
+                <div className="relative">
+                  <Lock size={18} className="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400" />
+                  <input
+                    type="password"
+                    value={formData.confirmPassword}
+                    onChange={(e) => setFormData({ ...formData, confirmPassword: e.target.value })}
+                    className={`w-full pl-10 pr-4 py-3 border rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white ${
+                      errors.confirmPassword ? 'border-red-500' : 'border-gray-300 dark:border-gray-600'
+                    }`}
+                  />
+                </div>
+                {errors.confirmPassword && <p className="text-red-500 text-xs mt-1">{errors.confirmPassword}</p>}
+              </div>
+            </div>
+          )}
+
+          {/* Step 2: Business Details */}
+          {currentStep === 2 && (
+            <div className="space-y-6">
+              <div>
+                <h2 className="text-2xl font-bold text-gray-900 dark:text-white mb-2">
+                  Business Details
+                </h2>
+                <p className="text-gray-600 dark:text-gray-400">
+                  Set up your business information
+                </p>
+              </div>
+
+              <div>
+                <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                  Business Name *
+                </label>
+                <div className="relative">
+                  <Building2 size={18} className="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400" />
+                  <input
+                    type="text"
+                    value={formData.business_name}
+                    onChange={(e) => {
+                      const name = e.target.value;
+                      const subdomain = name.toLowerCase().replace(/[^a-z0-9-]/g, '').substring(0, 20);
+                      setFormData({ ...formData, business_name: name, subdomain });
+                    }}
+                    className={`w-full pl-10 pr-4 py-3 border rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white ${
+                      errors.business_name ? 'border-red-500' : 'border-gray-300 dark:border-gray-600'
+                    }`}
+                  />
+                </div>
+                {errors.business_name && <p className="text-red-500 text-xs mt-1">{errors.business_name}</p>}
+              </div>
+
+              <div>
+                <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                  Subdomain *
+                </label>
+                <div className="flex items-center">
+                  <input
+                    type="text"
+                    value={formData.subdomain}
+                    onChange={(e) => setFormData({ ...formData, subdomain: e.target.value.toLowerCase().replace(/[^a-z0-9-]/g, '') })}
+                    className={`flex-1 px-4 py-3 border rounded-l-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white ${
+                      errors.subdomain ? 'border-red-500' : 'border-gray-300 dark:border-gray-600'
+                    }`}
+                    placeholder="mybusiness"
+                  />
+                  <span className="px-4 py-3 bg-gray-100 dark:bg-gray-600 border border-l-0 border-gray-300 dark:border-gray-600 rounded-r-lg text-gray-500 dark:text-gray-400">
+                    .lvh.me
+                  </span>
+                </div>
+                {errors.subdomain && <p className="text-red-500 text-xs mt-1">{errors.subdomain}</p>}
+                <p className="text-xs text-gray-500 dark:text-gray-400 mt-1">
+                  This will be your business URL: {formData.subdomain || 'your-business'}.lvh.me
+                </p>
+              </div>
+
+              <div className="grid grid-cols-2 gap-4">
+                <div>
+                  <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                    Contact Email
+                  </label>
+                  <input
+                    type="email"
+                    value={formData.contact_email}
+                    onChange={(e) => setFormData({ ...formData, contact_email: e.target.value })}
+                    className="w-full px-4 py-3 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white"
+                  />
+                </div>
+
+                <div>
+                  <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                    Phone (Optional)
+                  </label>
+                  <input
+                    type="tel"
+                    value={formData.phone}
+                    onChange={(e) => setFormData({ ...formData, phone: e.target.value })}
+                    className="w-full px-4 py-3 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white"
+                  />
+                </div>
+              </div>
+            </div>
+          )}
+
+          {/* Step 3: Payment Setup (conditional) */}
+          {currentStep === 3 && invitation.permissions?.can_accept_payments && (
+            <div className="space-y-6">
+              <div>
+                <h2 className="text-2xl font-bold text-gray-900 dark:text-white mb-2">
+                  Payment Setup
+                </h2>
+                <p className="text-gray-600 dark:text-gray-400">
+                  Connect Stripe to accept payments (optional - you can do this later)
+                </p>
+              </div>
+
+              <div className="border-2 border-dashed border-gray-300 dark:border-gray-600 rounded-lg p-12 text-center">
+                <CreditCard size={48} className="mx-auto text-gray-400 mb-4" />
+                <p className="text-gray-600 dark:text-gray-400 mb-4">
+                  Stripe Connect onboarding would go here
+                </p>
+                <button className="px-6 py-2 bg-indigo-600 text-white rounded-lg hover:bg-indigo-700">
+                  Connect Stripe
+                </button>
+                <p className="text-sm text-gray-500 dark:text-gray-400 mt-4">
+                  You can skip this and set it up later in settings
+                </p>
+              </div>
+            </div>
+          )}
+
+          {/* Step 4: Complete */}
+          {currentStep === totalSteps && (
+            <div className="space-y-6 text-center">
+              <div className="w-20 h-20 bg-green-100 dark:bg-green-900/30 rounded-full flex items-center justify-center mx-auto">
+                <CheckCircle size={48} className="text-green-600 dark:text-green-400" />
+              </div>
+              <div>
+                <h2 className="text-2xl font-bold text-gray-900 dark:text-white mb-2">
+                  All Set!
+                </h2>
+                <p className="text-gray-600 dark:text-gray-400">
+                  Your business <strong>{formData.business_name}</strong> has been created successfully.
+                </p>
+              </div>
+
+              <div className="bg-indigo-50 dark:bg-indigo-900/20 rounded-lg p-6">
+                <h3 className="font-semibold text-gray-900 dark:text-white mb-2">What's Next?</h3>
+                <ul className="text-left space-y-2 text-sm text-gray-600 dark:text-gray-400">
+                  <li>✓ Your account has been created</li>
+                  <li>✓ Business subdomain: {formData.subdomain}.lvh.me</li>
+                  <li>✓ You can now log in and start using SmoothSchedule</li>
+                </ul>
+              </div>
+
+              <button
+                onClick={() => {
+                  // Redirect to login or the business subdomain
+                  window.location.href = `http://${formData.subdomain}.lvh.me:5173`;
+                }}
+                className="px-8 py-3 bg-indigo-600 text-white rounded-lg hover:bg-indigo-700 font-medium"
+              >
+                Go to Dashboard
+              </button>
+            </div>
+          )}
+
+          {/* Navigation Buttons */}
+          {currentStep < totalSteps && (
+            <div className="flex items-center justify-between mt-8 pt-6 border-t border-gray-200 dark:border-gray-700">
+              <button
+                onClick={handleBack}
+                disabled={currentStep === 1}
+                className="flex items-center gap-2 px-6 py-2 text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg font-medium disabled:opacity-50 disabled:cursor-not-allowed"
+              >
+                <ArrowLeft size={18} />
+                Back
+              </button>
+
+              <button
+                onClick={currentStep === 2 && !invitation.permissions?.can_accept_payments ? handleSubmit : handleNext}
+                disabled={acceptInvitationMutation.isPending}
+                className="flex items-center gap-2 px-6 py-2 bg-indigo-600 text-white rounded-lg hover:bg-indigo-700 font-medium disabled:opacity-50 disabled:cursor-not-allowed"
+              >
+                {acceptInvitationMutation.isPending ? (
+                  <>
+                    <Loader className="animate-spin" size={18} />
+                    Creating...
+                  </>
+                ) : (
+                  <>
+                    {currentStep === 2 && !invitation.permissions?.can_accept_payments ? 'Create Business' : 'Continue'}
+                    <ArrowRight size={18} />
+                  </>
+                )}
+              </button>
+            </div>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default TenantOnboardPage;
diff --git a/frontend/src/pages/platform/PlatformBusinesses.tsx b/frontend/src/pages/platform/PlatformBusinesses.tsx
index 0e4ec44..0700193 100644
--- a/frontend/src/pages/platform/PlatformBusinesses.tsx
+++ b/frontend/src/pages/platform/PlatformBusinesses.tsx
@@ -1,8 +1,10 @@
-
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Search, Filter, MoreHorizontal, Eye, ShieldCheck, Ban } from 'lucide-react';
+import { Search, Filter, Eye, ShieldCheck, Ban, Pencil, Send, ChevronDown, ChevronRight, Building2 } from 'lucide-react';
 import { useBusinesses } from '../../hooks/usePlatform';
+import { PlatformBusiness } from '../../api/platform';
+import TenantInviteModal from './components/TenantInviteModal';
+import BusinessEditModal from './components/BusinessEditModal';
 
 interface PlatformBusinessesProps {
   onMasquerade: (targetUser: { id: number; username?: string; name?: string; email?: string; role?: string }) => void;
@@ -13,15 +15,22 @@ const PlatformBusinesses: React.FC<PlatformBusinessesProps> = ({ onMasquerade })
   const [searchTerm, setSearchTerm] = useState('');
   const { data: businesses, isLoading, error } = useBusinesses();
 
+  // Modal states
+  const [showInviteModal, setShowInviteModal] = useState(false);
+  const [editingBusiness, setEditingBusiness] = useState<PlatformBusiness | null>(null);
+  const [showInactiveBusinesses, setShowInactiveBusinesses] = useState(false);
+
+  // Filter and separate businesses
   const filteredBusinesses = (businesses || []).filter(b =>
     b.name.toLowerCase().includes(searchTerm.toLowerCase()) ||
     b.subdomain.toLowerCase().includes(searchTerm.toLowerCase())
   );
 
-  const handleLoginAs = (business: any) => {
-    // Use the owner data from the API response
+  const activeBusinesses = filteredBusinesses.filter(b => b.is_active);
+  const inactiveBusinesses = filteredBusinesses.filter(b => !b.is_active);
+
+  const handleLoginAs = (business: PlatformBusiness) => {
     if (business.owner) {
-      // Pass owner info to masquerade - we only need the id
       onMasquerade({
         id: business.owner.id,
         username: business.owner.username,
@@ -32,6 +41,69 @@ const PlatformBusinesses: React.FC<PlatformBusinessesProps> = ({ onMasquerade })
     }
   };
 
+  // Helper to render business row
+  const renderBusinessRow = (business: PlatformBusiness) => (
+    <tr key={business.id} className="hover:bg-gray-50 dark:hover:bg-gray-900/50">
+      <td className="px-6 py-4">
+        <div className="text-sm font-medium text-gray-900 dark:text-white">
+          {business.name}
+        </div>
+      </td>
+      <td className="px-6 py-4">
+        <div className="text-sm text-gray-500 dark:text-gray-400">
+          {business.subdomain}.lvh.me
+        </div>
+      </td>
+      <td className="px-6 py-4">
+        <span className="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-indigo-100 dark:bg-indigo-900/30 text-indigo-800 dark:text-indigo-300">
+          {business.tier}
+        </span>
+      </td>
+      <td className="px-6 py-4">
+        <div className="text-sm text-gray-900 dark:text-white">
+          {business.owner ? business.owner.full_name : '-'}
+        </div>
+        {business.owner && (
+          <div className="text-xs text-gray-500 dark:text-gray-400">
+            {business.owner.email}
+          </div>
+        )}
+      </td>
+      <td className="px-6 py-4">
+        {business.is_active ? (
+          <span className="inline-flex items-center gap-1 px-2.5 py-0.5 rounded-full text-xs font-medium bg-green-100 dark:bg-green-900/30 text-green-800 dark:text-green-300">
+            <ShieldCheck size={14} />
+            {t('platform.active')}
+          </span>
+        ) : (
+          <span className="inline-flex items-center gap-1 px-2.5 py-0.5 rounded-full text-xs font-medium bg-red-100 dark:bg-red-900/30 text-red-800 dark:text-red-300">
+            <Ban size={14} />
+            {t('platform.inactive')}
+          </span>
+        )}
+      </td>
+      <td className="px-6 py-4 text-right text-sm font-medium space-x-2">
+        {business.owner && (
+          <button
+            onClick={() => handleLoginAs(business)}
+            className="text-indigo-600 hover:text-indigo-500 dark:text-indigo-400 dark:hover:text-indigo-300 font-medium text-xs inline-flex items-center gap-1 px-3 py-1 border border-indigo-200 dark:border-indigo-800 rounded-lg hover:bg-indigo-50 dark:hover:bg-indigo-900/30 transition-colors"
+            title={`Masquerade as ${business.owner.email}`}
+          >
+            <Eye size={14} />
+            Masquerade
+          </button>
+        )}
+        <button
+          onClick={() => setEditingBusiness(business)}
+          className="inline-flex items-center gap-1 text-indigo-600 dark:text-indigo-400 hover:text-indigo-900 dark:hover:text-indigo-300"
+          title={t('common.edit')}
+        >
+          <Pencil size={16} />
+        </button>
+      </td>
+    </tr>
+  );
+
   if (isLoading) {
     return (
       <div className="flex items-center justify-center h-64">
@@ -50,103 +122,144 @@ const PlatformBusinesses: React.FC<PlatformBusinessesProps> = ({ onMasquerade })
 
   return (
     <div className="space-y-6">
+      {/* Header */}
       <div className="flex flex-col sm:flex-row sm:items-center justify-between gap-4">
         <div>
           <h2 className="text-2xl font-bold text-gray-900 dark:text-white">{t('platform.businesses')}</h2>
           <p className="text-gray-500 dark:text-gray-400">{t('platform.businessesDescription')}</p>
         </div>
-        <button className="px-4 py-2 bg-indigo-600 text-white rounded-lg hover:bg-indigo-700 font-medium shadow-sm">
-          {t('platform.addNewTenant')}
+        <button
+          onClick={() => setShowInviteModal(true)}
+          className="flex items-center gap-2 px-4 py-2 bg-indigo-600 text-white rounded-lg hover:bg-indigo-700 font-medium shadow-sm"
+        >
+          <Send size={18} />
+          Invite Tenant
         </button>
       </div>
 
+      {/* Search Bar */}
       <div className="flex items-center gap-4 bg-white dark:bg-gray-800 p-4 rounded-xl border border-gray-200 dark:border-gray-700 shadow-sm">
         <div className="relative flex-1">
-          <Search className="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400" size={18} />
+          <Search size={20} className="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400" />
           <input
             type="text"
             placeholder={t('platform.searchBusinesses')}
             value={searchTerm}
             onChange={(e) => setSearchTerm(e.target.value)}
-            className="w-full pl-10 pr-4 py-2 bg-gray-50 dark:bg-gray-700 border border-gray-200 dark:border-gray-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-indigo-500"
+            className="w-full pl-10 pr-4 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500"
           />
         </div>
-        <button className="flex items-center gap-2 px-4 py-2 text-gray-700 dark:text-gray-200 bg-gray-50 dark:bg-gray-700 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-600 border border-gray-200 dark:border-gray-600">
-          <Filter size={16} /> {t('common.filter')}
+        <button className="flex items-center gap-2 px-4 py-2 border border-gray-300 dark:border-gray-600 rounded-lg hover:bg-gray-50 dark:hover:bg-gray-700 text-gray-700 dark:text-gray-300 font-medium">
+          <Filter size={18} />
+          {t('common.filters')}
         </button>
       </div>
 
+      {/* Business Table */}
       <div className="bg-white dark:bg-gray-800 rounded-xl border border-gray-200 dark:border-gray-700 shadow-sm overflow-hidden">
-        <table className="w-full text-sm text-left">
-          <thead className="text-xs text-gray-500 dark:text-gray-400 uppercase bg-gray-50 dark:bg-gray-900/50 border-b border-gray-200 dark:border-gray-700">
-            <tr>
-              <th className="px-6 py-4 font-medium">{t('platform.businessName')}</th>
-              <th className="px-6 py-4 font-medium">{t('platform.subdomain')}</th>
-              <th className="px-6 py-4 font-medium">{t('platform.plan')}</th>
-              <th className="px-6 py-4 font-medium">{t('platform.status')}</th>
-              <th className="px-6 py-4 font-medium">{t('platform.joined')}</th>
-              <th className="px-6 py-4 font-medium text-right">{t('common.actions')}</th>
-            </tr>
-          </thead>
-          <tbody className="divide-y divide-gray-100 dark:divide-gray-700">
-            {filteredBusinesses.map((biz) => {
-              const tierDisplay = biz.tier.charAt(0).toUpperCase() + biz.tier.slice(1).toLowerCase();
-              const statusDisplay = biz.is_active ? 'Active' : 'Inactive';
+        <div className="overflow-x-auto">
+          <table className="w-full">
+            <thead className="bg-gray-50 dark:bg-gray-900 border-b border-gray-200 dark:border-gray-700">
+              <tr>
+                <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
+                  {t('platform.businessName')}
+                </th>
+                <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
+                  {t('platform.subdomain')}
+                </th>
+                <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
+                  {t('platform.tier')}
+                </th>
+                <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
+                  {t('platform.owner')}
+                </th>
+                <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
+                  {t('platform.status')}
+                </th>
+                <th className="px-6 py-3 text-right text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
+                  {t('common.actions')}
+                </th>
+              </tr>
+            </thead>
+            <tbody className="divide-y divide-gray-200 dark:divide-gray-700">
+              {activeBusinesses.map(renderBusinessRow)}
+            </tbody>
+          </table>
+        </div>
 
-              return (
-                <tr key={biz.id} className="hover:bg-gray-50 dark:hover:bg-gray-700/50 transition-colors">
-                  <td className="px-6 py-4 font-medium text-gray-900 dark:text-white">
-                    <div className="flex items-center gap-3">
-                      <div className="w-8 h-8 rounded bg-gray-100 dark:bg-gray-700 flex items-center justify-center font-bold text-xs text-indigo-600">
-                          {biz.name.substring(0, 2).toUpperCase()}
-                      </div>
-                      {biz.name}
-                    </div>
-                  </td>
-                  <td className="px-6 py-4 text-gray-500 dark:text-gray-400 font-mono text-xs">
-                    {biz.subdomain}.smoothschedule.com
-                  </td>
-                  <td className="px-6 py-4">
-                    <span className={`inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium
-                      ${biz.tier === 'ENTERPRISE' ? 'bg-purple-100 text-purple-800 dark:bg-purple-900/30 dark:text-purple-300' :
-                        biz.tier === 'BUSINESS' ? 'bg-blue-100 text-blue-800 dark:bg-blue-900/30 dark:text-blue-300' :
-                        biz.tier === 'PROFESSIONAL' ? 'bg-green-100 text-green-800 dark:bg-green-900/30 dark:text-green-300' :
-                        'bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-300'}
-                    `}>
-                      {tierDisplay}
-                    </span>
-                  </td>
-                  <td className="px-6 py-4">
-                     <div className="flex items-center gap-2">
-                      {biz.is_active && <ShieldCheck size={16} className="text-green-500" />}
-                      {!biz.is_active && <Ban size={16} className="text-red-500" />}
-                      <span className="text-gray-700 dark:text-gray-300">{statusDisplay}</span>
-                     </div>
-                  </td>
-                  <td className="px-6 py-4 text-gray-500 dark:text-gray-400">
-                    {new Date(biz.created_on).toLocaleDateString()}
-                  </td>
-                  <td className="px-6 py-4 text-right">
-                    <button
-                      onClick={() => handleLoginAs(biz)}
-                      className="text-indigo-600 hover:text-indigo-500 dark:text-indigo-400 dark:hover:text-indigo-300 font-medium text-xs inline-flex items-center gap-1 px-3 py-1 border border-indigo-200 dark:border-indigo-800 rounded-lg hover:bg-indigo-50 dark:hover:bg-indigo-900/30 transition-colors mr-2"
-                      disabled={!biz.owner}
-                      title={!biz.owner ? 'No owner assigned' : `Masquerade as ${biz.owner.full_name}`}
-                    >
-                      <Eye size={14} /> {t('platform.masquerade')}
-                    </button>
-                    <button className="text-gray-400 hover:text-gray-600 dark:hover:text-gray-200">
-                      <MoreHorizontal size={18} />
-                    </button>
-                  </td>
-                </tr>
-              );
-            })}
-          </tbody>
-        </table>
+        {activeBusinesses.length === 0 && inactiveBusinesses.length === 0 && (
+          <div className="text-center py-12">
+            <p className="text-gray-500 dark:text-gray-400">
+              {searchTerm ? t('platform.noBusinessesFound') : t('platform.noBusinesses')}
+            </p>
+          </div>
+        )}
       </div>
+
+      {/* Inactive Businesses Section */}
+      {inactiveBusinesses.length > 0 && (
+        <div className="bg-gray-100 dark:bg-gray-800/50 rounded-xl border border-gray-200 dark:border-gray-700">
+          <button
+            onClick={() => setShowInactiveBusinesses(!showInactiveBusinesses)}
+            className="w-full px-4 py-3 flex items-center justify-between text-left hover:bg-gray-200 dark:hover:bg-gray-700/50 rounded-xl transition-colors"
+          >
+            <div className="flex items-center gap-2 text-gray-600 dark:text-gray-400">
+              {showInactiveBusinesses ? <ChevronDown size={18} /> : <ChevronRight size={18} />}
+              <Building2 size={18} />
+              <span className="font-medium">
+                Inactive Businesses ({inactiveBusinesses.length})
+              </span>
+            </div>
+          </button>
+
+          {showInactiveBusinesses && (
+            <div className="border-t border-gray-200 dark:border-gray-700">
+              <div className="overflow-x-auto">
+                <table className="w-full">
+                  <thead className="bg-gray-50 dark:bg-gray-900 border-b border-gray-200 dark:border-gray-700">
+                    <tr>
+                      <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
+                        {t('platform.businessName')}
+                      </th>
+                      <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
+                        {t('platform.subdomain')}
+                      </th>
+                      <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
+                        {t('platform.tier')}
+                      </th>
+                      <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
+                        {t('platform.owner')}
+                      </th>
+                      <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
+                        {t('platform.status')}
+                      </th>
+                      <th className="px-6 py-3 text-right text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
+                        {t('common.actions')}
+                      </th>
+                    </tr>
+                  </thead>
+                  <tbody className="divide-y divide-gray-200 dark:divide-gray-700">
+                    {inactiveBusinesses.map(renderBusinessRow)}
+                  </tbody>
+                </table>
+              </div>
+            </div>
+          )}
+        </div>
+      )}
+
+      {/* Modals */}
+      <TenantInviteModal
+        isOpen={showInviteModal}
+        onClose={() => setShowInviteModal(false)}
+      />
+      <BusinessEditModal
+        business={editingBusiness}
+        isOpen={!!editingBusiness}
+        onClose={() => setEditingBusiness(null)}
+      />
     </div>
   );
 };
 
-export default PlatformBusinesses;
\ No newline at end of file
+export default PlatformBusinesses;
diff --git a/frontend/src/pages/platform/components/BusinessCreateModal.tsx b/frontend/src/pages/platform/components/BusinessCreateModal.tsx
new file mode 100644
index 0000000..aa647f6
--- /dev/null
+++ b/frontend/src/pages/platform/components/BusinessCreateModal.tsx
@@ -0,0 +1,407 @@
+import React, { useState } from 'react';
+import { X, Plus, Building2, Key, User, Mail, Lock } from 'lucide-react';
+import { useCreateBusiness } from '../../../hooks/usePlatform';
+
+interface BusinessCreateModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+}
+
+const BusinessCreateModal: React.FC<BusinessCreateModalProps> = ({ isOpen, onClose }) => {
+  const createBusinessMutation = useCreateBusiness();
+
+  const [createForm, setCreateForm] = useState({
+    name: '',
+    subdomain: '',
+    subscription_tier: 'FREE',
+    is_active: true,
+    max_users: 5,
+    max_resources: 10,
+    contact_email: '',
+    phone: '',
+    can_manage_oauth_credentials: false,
+    // Owner fields
+    create_owner: false,
+    owner_email: '',
+    owner_name: '',
+    owner_password: '',
+  });
+  const [createError, setCreateError] = useState<string | null>(null);
+
+  const resetForm = () => {
+    setCreateForm({
+      name: '',
+      subdomain: '',
+      subscription_tier: 'FREE',
+      is_active: true,
+      max_users: 5,
+      max_resources: 10,
+      contact_email: '',
+      phone: '',
+      can_manage_oauth_credentials: false,
+      create_owner: false,
+      owner_email: '',
+      owner_name: '',
+      owner_password: '',
+    });
+    setCreateError(null);
+  };
+
+  const handleClose = () => {
+    resetForm();
+    onClose();
+  };
+
+  const handleCreateSave = () => {
+    setCreateError(null);
+
+    // Basic validation
+    if (!createForm.name.trim()) {
+      setCreateError('Business name is required');
+      return;
+    }
+    if (!createForm.subdomain.trim()) {
+      setCreateError('Subdomain is required');
+      return;
+    }
+    if (createForm.create_owner) {
+      if (!createForm.owner_email.trim()) {
+        setCreateError('Owner email is required');
+        return;
+      }
+      if (!createForm.owner_name.trim()) {
+        setCreateError('Owner name is required');
+        return;
+      }
+      if (!createForm.owner_password.trim()) {
+        setCreateError('Owner password is required');
+        return;
+      }
+      if (createForm.owner_password.length < 8) {
+        setCreateError('Password must be at least 8 characters');
+        return;
+      }
+    }
+
+    const data: any = {
+      name: createForm.name,
+      subdomain: createForm.subdomain,
+      subscription_tier: createForm.subscription_tier,
+      is_active: createForm.is_active,
+      max_users: createForm.max_users,
+      max_resources: createForm.max_resources,
+      can_manage_oauth_credentials: createForm.can_manage_oauth_credentials,
+    };
+
+    if (createForm.contact_email) {
+      data.contact_email = createForm.contact_email;
+    }
+    if (createForm.phone) {
+      data.phone = createForm.phone;
+    }
+    if (createForm.create_owner) {
+      data.owner_email = createForm.owner_email;
+      data.owner_name = createForm.owner_name;
+      data.owner_password = createForm.owner_password;
+    }
+
+    createBusinessMutation.mutate(data, {
+      onSuccess: () => {
+        handleClose();
+      },
+      onError: (error: any) => {
+        const errorMessage = error?.response?.data?.subdomain?.[0]
+          || error?.response?.data?.owner_email?.[0]
+          || error?.response?.data?.detail
+          || error?.message
+          || 'Failed to create business';
+        setCreateError(errorMessage);
+      },
+    });
+  };
+
+  if (!isOpen) return null;
+
+  return (
+    <div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50">
+      <div className="bg-white dark:bg-gray-800 rounded-xl shadow-xl w-full max-w-2xl mx-4 max-h-[90vh] overflow-y-auto">
+        {/* Modal Header */}
+        <div className="flex items-center justify-between p-4 border-b border-gray-200 dark:border-gray-700">
+          <h3 className="text-lg font-semibold text-gray-900 dark:text-white flex items-center gap-2">
+            <Building2 size={20} className="text-indigo-500" />
+            Create New Business
+          </h3>
+          <button
+            onClick={handleClose}
+            className="text-gray-400 hover:text-gray-600 dark:hover:text-gray-200"
+          >
+            <X size={20} />
+          </button>
+        </div>
+
+        {/* Modal Body */}
+        <div className="p-4 space-y-4">
+          {/* Error Message */}
+          {createError && (
+            <div className="p-3 bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-800 rounded-lg text-red-700 dark:text-red-300 text-sm">
+              {createError}
+            </div>
+          )}
+
+          {/* Business Details Section */}
+          <div className="space-y-4">
+            <h4 className="text-sm font-semibold text-gray-900 dark:text-white flex items-center gap-2">
+              <Building2 size={16} className="text-indigo-500" />
+              Business Details
+            </h4>
+
+            {/* Business Name */}
+            <div>
+              <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                Business Name <span className="text-red-500">*</span>
+              </label>
+              <input
+                type="text"
+                value={createForm.name}
+                onChange={(e) => setCreateForm({ ...createForm, name: e.target.value })}
+                placeholder="My Awesome Business"
+                className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500"
+              />
+            </div>
+
+            {/* Subdomain */}
+            <div>
+              <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                Subdomain <span className="text-red-500">*</span>
+              </label>
+              <div className="flex items-center">
+                <input
+                  type="text"
+                  value={createForm.subdomain}
+                  onChange={(e) => setCreateForm({ ...createForm, subdomain: e.target.value.toLowerCase().replace(/[^a-z0-9-]/g, '') })}
+                  placeholder="mybusiness"
+                  className="flex-1 px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-l-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500"
+                />
+                <span className="px-3 py-2 bg-gray-100 dark:bg-gray-600 border border-l-0 border-gray-300 dark:border-gray-600 rounded-r-lg text-gray-500 dark:text-gray-400 text-sm">
+                  .lvh.me
+                </span>
+              </div>
+              <p className="text-xs text-gray-500 dark:text-gray-400 mt-1">
+                Only lowercase letters, numbers, and hyphens. Must start with a letter.
+              </p>
+            </div>
+
+            {/* Contact Info */}
+            <div className="grid grid-cols-2 gap-4">
+              <div>
+                <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                  Contact Email
+                </label>
+                <input
+                  type="email"
+                  value={createForm.contact_email}
+                  onChange={(e) => setCreateForm({ ...createForm, contact_email: e.target.value })}
+                  placeholder="contact@business.com"
+                  className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500"
+                />
+              </div>
+              <div>
+                <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                  Phone
+                </label>
+                <input
+                  type="tel"
+                  value={createForm.phone}
+                  onChange={(e) => setCreateForm({ ...createForm, phone: e.target.value })}
+                  placeholder="+1 (555) 123-4567"
+                  className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500"
+                />
+              </div>
+            </div>
+
+            {/* Status */}
+            <div className="flex items-center justify-between">
+              <div>
+                <label className="block text-sm font-medium text-gray-700 dark:text-gray-300">
+                  Active Status
+                </label>
+                <p className="text-xs text-gray-500 dark:text-gray-400">
+                  Create business as active
+                </p>
+              </div>
+              <button
+                type="button"
+                onClick={() => setCreateForm({ ...createForm, is_active: !createForm.is_active })}
+                className={`${createForm.is_active ? 'bg-green-600' : 'bg-gray-300 dark:bg-gray-600'} relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-indigo-500`}
+                role="switch"
+              >
+                <span className={`${createForm.is_active ? 'translate-x-5' : 'translate-x-0'} pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out`} />
+              </button>
+            </div>
+
+            {/* Subscription Tier */}
+            <div>
+              <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                Subscription Tier
+              </label>
+              <select
+                value={createForm.subscription_tier}
+                onChange={(e) => setCreateForm({ ...createForm, subscription_tier: e.target.value })}
+                className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500"
+              >
+                <option value="FREE">Free Trial</option>
+                <option value="STARTER">Starter</option>
+                <option value="PROFESSIONAL">Professional</option>
+                <option value="ENTERPRISE">Enterprise</option>
+              </select>
+            </div>
+
+            {/* Limits */}
+            <div className="grid grid-cols-2 gap-4">
+              <div>
+                <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                  Max Users
+                </label>
+                <input
+                  type="number"
+                  min="1"
+                  value={createForm.max_users}
+                  onChange={(e) => setCreateForm({ ...createForm, max_users: parseInt(e.target.value) || 1 })}
+                  className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500"
+                />
+              </div>
+              <div>
+                <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                  Max Resources
+                </label>
+                <input
+                  type="number"
+                  min="1"
+                  value={createForm.max_resources}
+                  onChange={(e) => setCreateForm({ ...createForm, max_resources: parseInt(e.target.value) || 1 })}
+                  className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500"
+                />
+              </div>
+            </div>
+          </div>
+
+          {/* Permissions Section */}
+          <div className="pt-4 border-t border-gray-200 dark:border-gray-700">
+            <h4 className="text-sm font-semibold text-gray-900 dark:text-white mb-3 flex items-center gap-2">
+              <Key size={16} className="text-purple-500" />
+              Platform Permissions
+            </h4>
+
+            {/* Can Manage OAuth Credentials */}
+            <div className="flex items-center justify-between p-3 bg-gray-50 dark:bg-gray-900/50 rounded-lg">
+              <div>
+                <label className="block text-sm font-medium text-gray-700 dark:text-gray-300">
+                  Manage OAuth Credentials
+                </label>
+                <p className="text-xs text-gray-500 dark:text-gray-400">
+                  Allow this business to configure their own OAuth app credentials
+                </p>
+              </div>
+              <button
+                type="button"
+                onClick={() => setCreateForm({ ...createForm, can_manage_oauth_credentials: !createForm.can_manage_oauth_credentials })}
+                className={`${createForm.can_manage_oauth_credentials ? 'bg-purple-600' : 'bg-gray-300 dark:bg-gray-600'} relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-purple-500`}
+                role="switch"
+              >
+                <span className={`${createForm.can_manage_oauth_credentials ? 'translate-x-5' : 'translate-x-0'} pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out`} />
+              </button>
+            </div>
+          </div>
+
+          {/* Owner Section */}
+          <div className="pt-4 border-t border-gray-200 dark:border-gray-700">
+            <div className="flex items-center justify-between mb-3">
+              <h4 className="text-sm font-semibold text-gray-900 dark:text-white flex items-center gap-2">
+                <User size={16} className="text-blue-500" />
+                Create Owner Account
+              </h4>
+              <button
+                type="button"
+                onClick={() => setCreateForm({ ...createForm, create_owner: !createForm.create_owner })}
+                className={`${createForm.create_owner ? 'bg-blue-600' : 'bg-gray-300 dark:bg-gray-600'} relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-blue-500`}
+                role="switch"
+              >
+                <span className={`${createForm.create_owner ? 'translate-x-5' : 'translate-x-0'} pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out`} />
+              </button>
+            </div>
+
+            {createForm.create_owner && (
+              <div className="space-y-3 p-3 bg-blue-50 dark:bg-blue-900/20 rounded-lg border border-blue-200 dark:border-blue-800">
+                <div>
+                  <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                    <Mail size={14} className="inline mr-1" />
+                    Owner Email <span className="text-red-500">*</span>
+                  </label>
+                  <input
+                    type="email"
+                    value={createForm.owner_email}
+                    onChange={(e) => setCreateForm({ ...createForm, owner_email: e.target.value })}
+                    placeholder="owner@business.com"
+                    className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
+                  />
+                </div>
+                <div>
+                  <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                    <User size={14} className="inline mr-1" />
+                    Owner Name <span className="text-red-500">*</span>
+                  </label>
+                  <input
+                    type="text"
+                    value={createForm.owner_name}
+                    onChange={(e) => setCreateForm({ ...createForm, owner_name: e.target.value })}
+                    placeholder="John Doe"
+                    className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
+                  />
+                </div>
+                <div>
+                  <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                    <Lock size={14} className="inline mr-1" />
+                    Password <span className="text-red-500">*</span>
+                  </label>
+                  <input
+                    type="password"
+                    value={createForm.owner_password}
+                    onChange={(e) => setCreateForm({ ...createForm, owner_password: e.target.value })}
+                    placeholder="Min. 8 characters"
+                    className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
+                  />
+                </div>
+              </div>
+            )}
+
+            {!createForm.create_owner && (
+              <p className="text-xs text-gray-500 dark:text-gray-400">
+                You can create an owner account later or invite one via email.
+              </p>
+            )}
+          </div>
+        </div>
+
+        {/* Modal Footer */}
+        <div className="flex items-center justify-end gap-3 p-4 border-t border-gray-200 dark:border-gray-700">
+          <button
+            onClick={handleClose}
+            className="px-4 py-2 text-gray-700 dark:text-gray-300 bg-gray-100 dark:bg-gray-700 rounded-lg hover:bg-gray-200 dark:hover:bg-gray-600 font-medium text-sm transition-colors"
+          >
+            Cancel
+          </button>
+          <button
+            onClick={handleCreateSave}
+            disabled={createBusinessMutation.isPending}
+            className="flex items-center gap-2 px-4 py-2 bg-indigo-600 text-white rounded-lg hover:bg-indigo-700 font-medium text-sm transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
+          >
+            <Plus size={16} />
+            {createBusinessMutation.isPending ? 'Creating...' : 'Create Business'}
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default BusinessCreateModal;
diff --git a/frontend/src/pages/platform/components/BusinessEditModal.tsx b/frontend/src/pages/platform/components/BusinessEditModal.tsx
new file mode 100644
index 0000000..ae9c550
--- /dev/null
+++ b/frontend/src/pages/platform/components/BusinessEditModal.tsx
@@ -0,0 +1,203 @@
+import React, { useState, useEffect } from 'react';
+import { X, Save, Key } from 'lucide-react';
+import { useUpdateBusiness } from '../../../hooks/usePlatform';
+import { PlatformBusiness } from '../../../api/platform';
+
+interface BusinessEditModalProps {
+  business: PlatformBusiness | null;
+  isOpen: boolean;
+  onClose: () => void;
+}
+
+const BusinessEditModal: React.FC<BusinessEditModalProps> = ({ business, isOpen, onClose }) => {
+  const updateBusinessMutation = useUpdateBusiness();
+
+  const [editForm, setEditForm] = useState({
+    name: '',
+    is_active: true,
+    subscription_tier: 'FREE',
+    max_users: 5,
+    max_resources: 10,
+    can_manage_oauth_credentials: false,
+  });
+
+  // Update form when business changes
+  useEffect(() => {
+    if (business) {
+      setEditForm({
+        name: business.name,
+        is_active: business.is_active,
+        subscription_tier: business.tier,
+        max_users: business.max_users || 5,
+        max_resources: business.max_resources || 10,
+        can_manage_oauth_credentials: business.can_manage_oauth_credentials || false,
+      });
+    }
+  }, [business]);
+
+  const handleEditSave = () => {
+    if (!business) return;
+
+    updateBusinessMutation.mutate(
+      {
+        businessId: business.id,
+        data: editForm,
+      },
+      {
+        onSuccess: () => {
+          onClose();
+        },
+      }
+    );
+  };
+
+  if (!isOpen || !business) return null;
+
+  return (
+    <div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50">
+      <div className="bg-white dark:bg-gray-800 rounded-xl shadow-xl w-full max-w-lg mx-4 max-h-[90vh] overflow-y-auto">
+        {/* Modal Header */}
+        <div className="flex items-center justify-between p-4 border-b border-gray-200 dark:border-gray-700">
+          <h3 className="text-lg font-semibold text-gray-900 dark:text-white">
+            Edit Business: {business.name}
+          </h3>
+          <button
+            onClick={onClose}
+            className="text-gray-400 hover:text-gray-600 dark:hover:text-gray-200"
+          >
+            <X size={20} />
+          </button>
+        </div>
+
+        {/* Modal Body */}
+        <div className="p-4 space-y-4">
+          {/* Business Name */}
+          <div>
+            <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+              Business Name
+            </label>
+            <input
+              type="text"
+              value={editForm.name}
+              onChange={(e) => setEditForm({ ...editForm, name: e.target.value })}
+              className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500"
+            />
+          </div>
+
+          {/* Status */}
+          <div className="flex items-center justify-between">
+            <div>
+              <label className="block text-sm font-medium text-gray-700 dark:text-gray-300">
+                Active Status
+              </label>
+              <p className="text-xs text-gray-500 dark:text-gray-400">
+                Inactive businesses cannot be accessed
+              </p>
+            </div>
+            <button
+              type="button"
+              onClick={() => setEditForm({ ...editForm, is_active: !editForm.is_active })}
+              className={`${editForm.is_active ? 'bg-green-600' : 'bg-gray-300 dark:bg-gray-600'} relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-indigo-500`}
+              role="switch"
+            >
+              <span className={`${editForm.is_active ? 'translate-x-5' : 'translate-x-0'} pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out`} />
+            </button>
+          </div>
+
+          {/* Subscription Tier */}
+          <div>
+            <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+              Subscription Tier
+            </label>
+            <select
+              value={editForm.subscription_tier}
+              onChange={(e) => setEditForm({ ...editForm, subscription_tier: e.target.value })}
+              className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500"
+            >
+              <option value="FREE">Free Trial</option>
+              <option value="STARTER">Starter</option>
+              <option value="PROFESSIONAL">Professional</option>
+              <option value="ENTERPRISE">Enterprise</option>
+            </select>
+          </div>
+
+          {/* Limits */}
+          <div className="grid grid-cols-2 gap-4">
+            <div>
+              <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                Max Users
+              </label>
+              <input
+                type="number"
+                min="1"
+                value={editForm.max_users}
+                onChange={(e) => setEditForm({ ...editForm, max_users: parseInt(e.target.value) || 1 })}
+                className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500"
+              />
+            </div>
+            <div>
+              <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                Max Resources
+              </label>
+              <input
+                type="number"
+                min="1"
+                value={editForm.max_resources}
+                onChange={(e) => setEditForm({ ...editForm, max_resources: parseInt(e.target.value) || 1 })}
+                className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500"
+              />
+            </div>
+          </div>
+
+          {/* Permissions Section */}
+          <div className="pt-4 border-t border-gray-200 dark:border-gray-700">
+            <h4 className="text-sm font-semibold text-gray-900 dark:text-white mb-3 flex items-center gap-2">
+              <Key size={16} className="text-purple-500" />
+              Platform Permissions
+            </h4>
+
+            {/* Can Manage OAuth Credentials */}
+            <div className="flex items-center justify-between p-3 bg-gray-50 dark:bg-gray-900/50 rounded-lg">
+              <div>
+                <label className="block text-sm font-medium text-gray-700 dark:text-gray-300">
+                  Manage OAuth Credentials
+                </label>
+                <p className="text-xs text-gray-500 dark:text-gray-400">
+                  Allow this business to configure their own OAuth app credentials
+                </p>
+              </div>
+              <button
+                type="button"
+                onClick={() => setEditForm({ ...editForm, can_manage_oauth_credentials: !editForm.can_manage_oauth_credentials })}
+                className={`${editForm.can_manage_oauth_credentials ? 'bg-purple-600' : 'bg-gray-300 dark:bg-gray-600'} relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-purple-500`}
+                role="switch"
+              >
+                <span className={`${editForm.can_manage_oauth_credentials ? 'translate-x-5' : 'translate-x-0'} pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out`} />
+              </button>
+            </div>
+          </div>
+        </div>
+
+        {/* Modal Footer */}
+        <div className="flex items-center justify-end gap-3 p-4 border-t border-gray-200 dark:border-gray-700">
+          <button
+            onClick={onClose}
+            className="px-4 py-2 text-gray-700 dark:text-gray-300 bg-gray-100 dark:bg-gray-700 rounded-lg hover:bg-gray-200 dark:hover:bg-gray-600 font-medium text-sm transition-colors"
+          >
+            Cancel
+          </button>
+          <button
+            onClick={handleEditSave}
+            disabled={updateBusinessMutation.isPending}
+            className="flex items-center gap-2 px-4 py-2 bg-indigo-600 text-white rounded-lg hover:bg-indigo-700 font-medium text-sm transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
+          >
+            <Save size={16} />
+            {updateBusinessMutation.isPending ? 'Saving...' : 'Save Changes'}
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default BusinessEditModal;
diff --git a/frontend/src/pages/platform/components/TenantInviteModal.tsx b/frontend/src/pages/platform/components/TenantInviteModal.tsx
new file mode 100644
index 0000000..7cf3c3c
--- /dev/null
+++ b/frontend/src/pages/platform/components/TenantInviteModal.tsx
@@ -0,0 +1,518 @@
+import React, { useState } from 'react';
+import { X, Send, Mail, Building2 } from 'lucide-react';
+import { useCreateTenantInvitation } from '../../../hooks/usePlatform';
+
+interface TenantInviteModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+}
+
+const TenantInviteModal: React.FC<TenantInviteModalProps> = ({ isOpen, onClose }) => {
+  const createInvitationMutation = useCreateTenantInvitation();
+
+  const [inviteForm, setInviteForm] = useState({
+    email: '',
+    suggested_business_name: '',
+    subscription_tier: 'PROFESSIONAL' as 'FREE' | 'STARTER' | 'PROFESSIONAL' | 'ENTERPRISE',
+    custom_max_users: null as number | null,
+    custom_max_resources: null as number | null,
+    use_custom_limits: false,
+    permissions: {
+      can_manage_oauth_credentials: false,
+      can_accept_payments: false,
+      can_use_custom_domain: false,
+      can_white_label: false,
+      can_api_access: false,
+    },
+    // New feature limits (not yet implemented)
+    limits: {
+      can_add_video_conferencing: false,
+      max_event_types: null as number | null, // null = unlimited
+      max_calendars_connected: null as number | null, // null = unlimited
+      can_connect_to_api: false,
+      can_book_repeated_events: false,
+      can_require_2fa: false,
+      can_download_logs: false,
+      can_delete_data: false,
+      can_use_masked_phone_numbers: false,
+      can_use_pos: false,
+      can_use_mobile_app: false,
+    },
+    personal_message: '',
+  });
+  const [inviteError, setInviteError] = useState<string | null>(null);
+  const [inviteSuccess, setInviteSuccess] = useState(false);
+
+  const resetForm = () => {
+    setInviteForm({
+      email: '',
+      suggested_business_name: '',
+      subscription_tier: 'PROFESSIONAL',
+      custom_max_users: null,
+      custom_max_resources: null,
+      use_custom_limits: false,
+      permissions: {
+        can_manage_oauth_credentials: false,
+        can_accept_payments: false,
+        can_use_custom_domain: false,
+        can_white_label: false,
+        can_api_access: false,
+      },
+      limits: {
+        can_add_video_conferencing: false,
+        max_event_types: null,
+        max_calendars_connected: null,
+        can_connect_to_api: false,
+        can_book_repeated_events: false,
+        can_require_2fa: false,
+        can_download_logs: false,
+        can_delete_data: false,
+        can_use_masked_phone_numbers: false,
+        can_use_pos: false,
+        can_use_mobile_app: false,
+      },
+      personal_message: '',
+    });
+    setInviteError(null);
+    setInviteSuccess(false);
+  };
+
+  const handleClose = () => {
+    resetForm();
+    onClose();
+  };
+
+  const handleInviteSend = () => {
+    setInviteError(null);
+    setInviteSuccess(false);
+
+    // Validation
+    if (!inviteForm.email.trim()) {
+      setInviteError('Email address is required');
+      return;
+    }
+    if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(inviteForm.email)) {
+      setInviteError('Please enter a valid email address');
+      return;
+    }
+
+    // Build invitation data
+    const data: any = {
+      email: inviteForm.email,
+      subscription_tier: inviteForm.subscription_tier,
+    };
+
+    if (inviteForm.suggested_business_name.trim()) {
+      data.suggested_business_name = inviteForm.suggested_business_name.trim();
+    }
+
+    if (inviteForm.use_custom_limits) {
+      if (inviteForm.custom_max_users !== null && inviteForm.custom_max_users > 0) {
+        data.custom_max_users = inviteForm.custom_max_users;
+      }
+      if (inviteForm.custom_max_resources !== null && inviteForm.custom_max_resources > 0) {
+        data.custom_max_resources = inviteForm.custom_max_resources;
+      }
+    }
+
+    // Only include permissions if at least one is enabled
+    const hasPermissions = Object.values(inviteForm.permissions).some(v => v === true);
+    if (hasPermissions) {
+      data.permissions = inviteForm.permissions;
+    }
+
+    if (inviteForm.personal_message.trim()) {
+      data.personal_message = inviteForm.personal_message.trim();
+    }
+
+    createInvitationMutation.mutate(data, {
+      onSuccess: () => {
+        setInviteSuccess(true);
+        setTimeout(() => {
+          handleClose();
+        }, 2000);
+      },
+      onError: (error: any) => {
+        setInviteError(error.response?.data?.detail || error.message || 'Failed to send invitation');
+      },
+    });
+  };
+
+  if (!isOpen) return null;
+
+  return (
+    <div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50">
+      <div className="bg-white dark:bg-gray-800 rounded-xl shadow-xl w-full max-w-2xl mx-4 max-h-[90vh] overflow-y-auto">
+        {/* Modal Header */}
+        <div className="flex items-center justify-between p-6 border-b border-gray-200 dark:border-gray-700">
+          <div className="flex items-center gap-3">
+            <div className="p-2 bg-indigo-100 dark:bg-indigo-900/30 rounded-lg">
+              <Send size={24} className="text-indigo-600 dark:text-indigo-400" />
+            </div>
+            <div>
+              <h3 className="text-lg font-semibold text-gray-900 dark:text-white">Invite New Tenant</h3>
+              <p className="text-sm text-gray-500 dark:text-gray-400">Send an invitation to create a new business</p>
+            </div>
+          </div>
+          <button
+            onClick={handleClose}
+            className="p-2 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors"
+          >
+            <X size={20} className="text-gray-500 dark:text-gray-400" />
+          </button>
+        </div>
+
+        {/* Modal Body */}
+        <div className="p-6 space-y-6">
+          {inviteError && (
+            <div className="p-4 bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-800 rounded-lg">
+              <p className="text-sm text-red-600 dark:text-red-400">{inviteError}</p>
+            </div>
+          )}
+
+          {inviteSuccess && (
+            <div className="p-4 bg-green-50 dark:bg-green-900/20 border border-green-200 dark:border-green-800 rounded-lg">
+              <p className="text-sm text-green-600 dark:text-green-400">Invitation sent successfully!</p>
+            </div>
+          )}
+
+          {/* Email */}
+          <div>
+            <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+              Email Address *
+            </label>
+            <div className="relative">
+              <Mail size={18} className="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400" />
+              <input
+                type="email"
+                value={inviteForm.email}
+                onChange={(e) => setInviteForm({ ...inviteForm, email: e.target.value })}
+                className="w-full pl-10 pr-4 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white"
+                placeholder="owner@business.com"
+              />
+            </div>
+          </div>
+
+          {/* Suggested Business Name */}
+          <div>
+            <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+              Suggested Business Name (Optional)
+            </label>
+            <div className="relative">
+              <Building2 size={18} className="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400" />
+              <input
+                type="text"
+                value={inviteForm.suggested_business_name}
+                onChange={(e) => setInviteForm({ ...inviteForm, suggested_business_name: e.target.value })}
+                className="w-full pl-10 pr-4 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white"
+                placeholder="Owner can change this during onboarding"
+              />
+            </div>
+          </div>
+
+          {/* Subscription Tier */}
+          <div>
+            <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+              Subscription Tier
+            </label>
+            <select
+              value={inviteForm.subscription_tier}
+              onChange={(e) => setInviteForm({ ...inviteForm, subscription_tier: e.target.value as any })}
+              className="w-full px-4 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white"
+            >
+              <option value="FREE">Free Trial</option>
+              <option value="STARTER">Starter</option>
+              <option value="PROFESSIONAL">Professional</option>
+              <option value="ENTERPRISE">Enterprise</option>
+            </select>
+          </div>
+
+          {/* Custom Limits */}
+          <div>
+            <label className="flex items-center gap-2 text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+              <input
+                type="checkbox"
+                checked={inviteForm.use_custom_limits}
+                onChange={(e) => setInviteForm({ ...inviteForm, use_custom_limits: e.target.checked })}
+                className="rounded border-gray-300 dark:border-gray-600"
+              />
+              Override tier limits with custom values
+            </label>
+            {inviteForm.use_custom_limits && (
+              <div className="grid grid-cols-2 gap-4 mt-2">
+                <div>
+                  <label className="block text-xs text-gray-600 dark:text-gray-400 mb-1">Max Users</label>
+                  <input
+                    type="number"
+                    min="1"
+                    value={inviteForm.custom_max_users || ''}
+                    onChange={(e) => setInviteForm({ ...inviteForm, custom_max_users: e.target.value ? parseInt(e.target.value) : null })}
+                    className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white"
+                    placeholder="Leave empty for tier default"
+                  />
+                </div>
+                <div>
+                  <label className="block text-xs text-gray-600 dark:text-gray-400 mb-1">Max Resources</label>
+                  <input
+                    type="number"
+                    min="1"
+                    value={inviteForm.custom_max_resources || ''}
+                    onChange={(e) => setInviteForm({ ...inviteForm, custom_max_resources: e.target.value ? parseInt(e.target.value) : null })}
+                    className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white"
+                    placeholder="Leave empty for tier default"
+                  />
+                </div>
+              </div>
+            )}
+          </div>
+
+          {/* Platform Permissions */}
+          <div>
+            <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-3">
+              Platform Permissions
+            </label>
+            <div className="space-y-2">
+              <label className="flex items-center gap-2 text-sm text-gray-700 dark:text-gray-300">
+                <input
+                  type="checkbox"
+                  checked={inviteForm.permissions.can_manage_oauth_credentials}
+                  onChange={(e) => setInviteForm({ ...inviteForm, permissions: { ...inviteForm.permissions, can_manage_oauth_credentials: e.target.checked } })}
+                  className="rounded border-gray-300 dark:border-gray-600"
+                />
+                Can manage OAuth credentials
+              </label>
+              <label className="flex items-center gap-2 text-sm text-gray-700 dark:text-gray-300">
+                <input
+                  type="checkbox"
+                  checked={inviteForm.permissions.can_accept_payments}
+                  onChange={(e) => setInviteForm({ ...inviteForm, permissions: { ...inviteForm.permissions, can_accept_payments: e.target.checked } })}
+                  className="rounded border-gray-300 dark:border-gray-600"
+                />
+                Can accept online payments (Stripe Connect)
+              </label>
+              <label className="flex items-center gap-2 text-sm text-gray-700 dark:text-gray-300">
+                <input
+                  type="checkbox"
+                  checked={inviteForm.permissions.can_use_custom_domain}
+                  onChange={(e) => setInviteForm({ ...inviteForm, permissions: { ...inviteForm.permissions, can_use_custom_domain: e.target.checked } })}
+                  className="rounded border-gray-300 dark:border-gray-600"
+                />
+                Can use custom domain
+              </label>
+              <label className="flex items-center gap-2 text-sm text-gray-700 dark:text-gray-300">
+                <input
+                  type="checkbox"
+                  checked={inviteForm.permissions.can_white_label}
+                  onChange={(e) => setInviteForm({ ...inviteForm, permissions: { ...inviteForm.permissions, can_white_label: e.target.checked } })}
+                  className="rounded border-gray-300 dark:border-gray-600"
+                />
+                Can remove SmoothSchedule branding
+              </label>
+              <label className="flex items-center gap-2 text-sm text-gray-700 dark:text-gray-300">
+                <input
+                  type="checkbox"
+                  checked={inviteForm.permissions.can_api_access}
+                  onChange={(e) => setInviteForm({ ...inviteForm, permissions: { ...inviteForm.permissions, can_api_access: e.target.checked } })}
+                  className="rounded border-gray-300 dark:border-gray-600"
+                />
+                Can access API for integrations
+              </label>
+            </div>
+          </div>
+
+          {/* Feature Limits (Not Yet Implemented) */}
+          <div className="border-t border-gray-200 dark:border-gray-700 pt-6">
+            <div className="flex items-center justify-between mb-3">
+              <label className="block text-sm font-medium text-gray-700 dark:text-gray-300">
+                Feature Limits & Capabilities
+              </label>
+              <span className="text-xs px-2 py-1 bg-yellow-100 dark:bg-yellow-900/30 text-yellow-700 dark:text-yellow-400 rounded-full">
+                Coming Soon
+              </span>
+            </div>
+            <div className="space-y-3 opacity-50">
+              {/* Video Conferencing */}
+              <label className="flex items-center gap-2 text-sm text-gray-700 dark:text-gray-300">
+                <input
+                  type="checkbox"
+                  checked={inviteForm.limits.can_add_video_conferencing}
+                  disabled
+                  className="rounded border-gray-300 dark:border-gray-600 cursor-not-allowed"
+                />
+                Can add video conferencing to events
+              </label>
+
+              {/* Event Types Limit */}
+              <div className="flex items-start gap-3">
+                <input
+                  type="checkbox"
+                  checked={inviteForm.limits.max_event_types === null}
+                  disabled
+                  className="rounded border-gray-300 dark:border-gray-600 mt-1 cursor-not-allowed"
+                />
+                <div className="flex-1">
+                  <div className="flex items-center gap-2">
+                    <span className="text-sm text-gray-700 dark:text-gray-300">Unlimited event types</span>
+                  </div>
+                  <input
+                    type="number"
+                    min="1"
+                    disabled
+                    value={inviteForm.limits.max_event_types || ''}
+                    placeholder="Or set a limit"
+                    className="mt-1 w-32 px-2 py-1 text-sm border border-gray-300 dark:border-gray-600 rounded bg-white dark:bg-gray-700 text-gray-900 dark:text-white cursor-not-allowed"
+                  />
+                </div>
+              </div>
+
+              {/* Calendars Connected Limit */}
+              <div className="flex items-start gap-3">
+                <input
+                  type="checkbox"
+                  checked={inviteForm.limits.max_calendars_connected === null}
+                  disabled
+                  className="rounded border-gray-300 dark:border-gray-600 mt-1 cursor-not-allowed"
+                />
+                <div className="flex-1">
+                  <div className="flex items-center gap-2">
+                    <span className="text-sm text-gray-700 dark:text-gray-300">Unlimited calendar connections</span>
+                  </div>
+                  <input
+                    type="number"
+                    min="1"
+                    disabled
+                    value={inviteForm.limits.max_calendars_connected || ''}
+                    placeholder="Or set a limit"
+                    className="mt-1 w-32 px-2 py-1 text-sm border border-gray-300 dark:border-gray-600 rounded bg-white dark:bg-gray-700 text-gray-900 dark:text-white cursor-not-allowed"
+                  />
+                </div>
+              </div>
+
+              {/* API Access */}
+              <label className="flex items-center gap-2 text-sm text-gray-700 dark:text-gray-300">
+                <input
+                  type="checkbox"
+                  checked={inviteForm.limits.can_connect_to_api}
+                  disabled
+                  className="rounded border-gray-300 dark:border-gray-600 cursor-not-allowed"
+                />
+                Can connect to external APIs
+              </label>
+
+              {/* Repeated Events */}
+              <label className="flex items-center gap-2 text-sm text-gray-700 dark:text-gray-300">
+                <input
+                  type="checkbox"
+                  checked={inviteForm.limits.can_book_repeated_events}
+                  disabled
+                  className="rounded border-gray-300 dark:border-gray-600 cursor-not-allowed"
+                />
+                Can book repeated/recurring events
+              </label>
+
+              {/* 2FA */}
+              <label className="flex items-center gap-2 text-sm text-gray-700 dark:text-gray-300">
+                <input
+                  type="checkbox"
+                  checked={inviteForm.limits.can_require_2fa}
+                  disabled
+                  className="rounded border-gray-300 dark:border-gray-600 cursor-not-allowed"
+                />
+                Can require 2FA for users
+              </label>
+
+              {/* Download Logs */}
+              <label className="flex items-center gap-2 text-sm text-gray-700 dark:text-gray-300">
+                <input
+                  type="checkbox"
+                  checked={inviteForm.limits.can_download_logs}
+                  disabled
+                  className="rounded border-gray-300 dark:border-gray-600 cursor-not-allowed"
+                />
+                Can download system logs
+              </label>
+
+              {/* Delete Data */}
+              <label className="flex items-center gap-2 text-sm text-gray-700 dark:text-gray-300">
+                <input
+                  type="checkbox"
+                  checked={inviteForm.limits.can_delete_data}
+                  disabled
+                  className="rounded border-gray-300 dark:border-gray-600 cursor-not-allowed"
+                />
+                Can permanently delete data
+              </label>
+
+              {/* Masked Phone Numbers */}
+              <label className="flex items-center gap-2 text-sm text-gray-700 dark:text-gray-300">
+                <input
+                  type="checkbox"
+                  checked={inviteForm.limits.can_use_masked_phone_numbers}
+                  disabled
+                  className="rounded border-gray-300 dark:border-gray-600 cursor-not-allowed"
+                />
+                Can use masked phone numbers for privacy
+              </label>
+
+              {/* POS Integration */}
+              <label className="flex items-center gap-2 text-sm text-gray-700 dark:text-gray-300">
+                <input
+                  type="checkbox"
+                  checked={inviteForm.limits.can_use_pos}
+                  disabled
+                  className="rounded border-gray-300 dark:border-gray-600 cursor-not-allowed"
+                />
+                Can use Point of Sale (POS) system
+              </label>
+
+              {/* Mobile App */}
+              <label className="flex items-center gap-2 text-sm text-gray-700 dark:text-gray-300">
+                <input
+                  type="checkbox"
+                  checked={inviteForm.limits.can_use_mobile_app}
+                  disabled
+                  className="rounded border-gray-300 dark:border-gray-600 cursor-not-allowed"
+                />
+                Can use mobile app
+              </label>
+            </div>
+          </div>
+
+          {/* Personal Message */}
+          <div>
+            <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+              Personal Message (Optional)
+            </label>
+            <textarea
+              value={inviteForm.personal_message}
+              onChange={(e) => setInviteForm({ ...inviteForm, personal_message: e.target.value })}
+              rows={3}
+              className="w-full px-4 py-2 border border-gray-300 dark:border-gray-600 rounded-lg bg-white dark:bg-gray-700 text-gray-900 dark:text-white"
+              placeholder="Add a personal note to the invitation email..."
+            />
+          </div>
+        </div>
+
+        {/* Modal Footer */}
+        <div className="flex items-center justify-end gap-3 p-6 border-t border-gray-200 dark:border-gray-700">
+          <button
+            onClick={handleClose}
+            className="px-4 py-2 text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg font-medium text-sm transition-colors"
+          >
+            Cancel
+          </button>
+          <button
+            onClick={handleInviteSend}
+            disabled={createInvitationMutation.isPending || inviteSuccess}
+            className="flex items-center gap-2 px-4 py-2 bg-indigo-600 text-white rounded-lg hover:bg-indigo-700 font-medium text-sm transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
+          >
+            <Send size={16} />
+            {createInvitationMutation.isPending ? 'Sending...' : inviteSuccess ? 'Sent!' : 'Send Invitation'}
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default TenantInviteModal;
diff --git a/frontend/src/types.ts b/frontend/src/types.ts
index da96637..5776c9b 100644
--- a/frontend/src/types.ts
+++ b/frontend/src/types.ts
@@ -61,6 +61,8 @@ export interface Business {
   isTrialExpired?: boolean;
   daysLeftInTrial?: number;
   resourceTypes?: ResourceTypeDefinition[]; // Custom resource types
+  // Platform-controlled permissions
+  canManageOAuthCredentials?: boolean;
 }
 
 export type UserRole = 'superuser' | 'platform_manager' | 'platform_support' | 'owner' | 'manager' | 'staff' | 'resource' | 'customer';
@@ -196,34 +198,34 @@ export interface PlatformMetric {
 
 // --- OAuth Settings Types ---
 
+export interface OAuthProvider {
+  id: string;
+  name: string;
+  icon: string;
+  description: string;
+}
+
 export interface BusinessOAuthSettings {
   enabledProviders: string[];
   allowRegistration: boolean;
   autoLinkByEmail: boolean;
+  useCustomCredentials: boolean;
 }
 
 export interface BusinessOAuthSettingsResponse {
-  businessSettings: BusinessOAuthSettings;
-  availableProviders: string[];
+  settings: BusinessOAuthSettings;
+  availableProviders: OAuthProvider[];
 }
 
 // --- OAuth Credentials Types ---
 
-export interface OAuthProviderCredentials {
+export interface OAuthProviderCredential {
   client_id: string;
   client_secret: string;
-  team_id?: string; // Apple only
-  key_id?: string; // Apple only
-  tenant_id?: string; // Microsoft only
+  has_secret: boolean;
 }
 
-export interface BusinessOAuthCredentials {
-  use_custom_credentials: boolean;
-  google?: OAuthProviderCredentials;
-  apple?: OAuthProviderCredentials;
-  facebook?: OAuthProviderCredentials;
-  linkedin?: OAuthProviderCredentials;
-  microsoft?: OAuthProviderCredentials;
-  twitter?: OAuthProviderCredentials;
-  twitch?: OAuthProviderCredentials;
+export interface BusinessOAuthCredentialsResponse {
+  credentials: Record<string, OAuthProviderCredential>;
+  useCustomCredentials: boolean;
 }
\ No newline at end of file
diff --git a/smoothschedule/config/settings/base.py b/smoothschedule/config/settings/base.py
index a8229f8..39ea1dd 100644
--- a/smoothschedule/config/settings/base.py
+++ b/smoothschedule/config/settings/base.py
@@ -82,7 +82,7 @@ LOCAL_APPS = [
     "core",
     "schedule",
     "payments",
-    "platform_admin",
+    "platform_admin.apps.PlatformAdminConfig",
     # Your stuff: custom apps go here
 ]
 # https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps
diff --git a/smoothschedule/config/settings/multitenancy.py b/smoothschedule/config/settings/multitenancy.py
index 6cd4979..a6afb5d 100644
--- a/smoothschedule/config/settings/multitenancy.py
+++ b/smoothschedule/config/settings/multitenancy.py
@@ -14,7 +14,8 @@ from .base import INSTALLED_APPS, MIDDLEWARE, DATABASES, LOGGING, env
 SHARED_APPS = [
     'django_tenants',  # Must be first
     'core',  # Core models (Tenant, Domain, PermissionGrant)
-    
+    'platform_admin.apps.PlatformAdminConfig',  # Platform management (TenantInvitation, etc.)
+
     # Django built-ins (must be in shared
     'django.contrib.contenttypes',
     'django.contrib.auth',
@@ -23,10 +24,10 @@ SHARED_APPS = [
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'django.contrib.admin',
-    
+
     # Users app (shared across tenants)
     'smoothschedule.users',
-    
+
     # Third-party apps that should be shared
     'rest_framework',
     'rest_framework.authtoken',
diff --git a/smoothschedule/config/urls.py b/smoothschedule/config/urls.py
index cbb760c..127a2ee 100644
--- a/smoothschedule/config/urls.py
+++ b/smoothschedule/config/urls.py
@@ -16,7 +16,10 @@ from smoothschedule.users.api_views import (
     staff_invitations_view, cancel_invitation_view, resend_invitation_view,
     invitation_details_view, accept_invitation_view, decline_invitation_view
 )
-from schedule.api_views import current_business_view, update_business_view
+from schedule.api_views import (
+    current_business_view, update_business_view,
+    oauth_settings_view, oauth_credentials_view
+)
 
 urlpatterns = [
     # Django Admin, use {% url 'admin:index' %}
@@ -59,6 +62,8 @@ urlpatterns += [
     # Business API
     path("api/business/current/", current_business_view, name="current_business"),
     path("api/business/current/update/", update_business_view, name="update_business"),
+    path("api/business/oauth-settings/", oauth_settings_view, name="oauth_settings"),
+    path("api/business/oauth-credentials/", oauth_credentials_view, name="oauth_credentials"),
     # API Docs
     path("api/schema/", SpectacularAPIView.as_view(), name="api-schema"),
     path(
diff --git a/smoothschedule/core/migrations/0005_add_oauth_settings_to_tenant.py b/smoothschedule/core/migrations/0005_add_oauth_settings_to_tenant.py
new file mode 100644
index 0000000..c34b1fc
--- /dev/null
+++ b/smoothschedule/core/migrations/0005_add_oauth_settings_to_tenant.py
@@ -0,0 +1,38 @@
+# Generated by Django 5.2.8 on 2025-11-28 07:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0004_tenant_email_logo_alter_tenant_logo'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='tenant',
+            name='oauth_allow_registration',
+            field=models.BooleanField(default=True, help_text='Allow new customers to register via OAuth'),
+        ),
+        migrations.AddField(
+            model_name='tenant',
+            name='oauth_auto_link_by_email',
+            field=models.BooleanField(default=True, help_text='Automatically link OAuth accounts to existing accounts with matching email'),
+        ),
+        migrations.AddField(
+            model_name='tenant',
+            name='oauth_credentials',
+            field=models.JSONField(blank=True, default=dict, help_text='Custom OAuth credentials for each provider (encrypted at rest)'),
+        ),
+        migrations.AddField(
+            model_name='tenant',
+            name='oauth_enabled_providers',
+            field=models.JSONField(blank=True, default=list, help_text="List of enabled OAuth providers (e.g., ['google', 'facebook', 'apple'])"),
+        ),
+        migrations.AddField(
+            model_name='tenant',
+            name='oauth_use_custom_credentials',
+            field=models.BooleanField(default=False, help_text="Use business's own OAuth app credentials instead of platform credentials"),
+        ),
+    ]
diff --git a/smoothschedule/core/migrations/0006_add_can_manage_oauth_credentials.py b/smoothschedule/core/migrations/0006_add_can_manage_oauth_credentials.py
new file mode 100644
index 0000000..45948e6
--- /dev/null
+++ b/smoothschedule/core/migrations/0006_add_can_manage_oauth_credentials.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.2.8 on 2025-11-28 07:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0005_add_oauth_settings_to_tenant'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='tenant',
+            name='can_manage_oauth_credentials',
+            field=models.BooleanField(default=False, help_text='Whether this business can manage their own OAuth credentials'),
+        ),
+    ]
diff --git a/smoothschedule/core/migrations/0007_add_tenant_permissions.py b/smoothschedule/core/migrations/0007_add_tenant_permissions.py
new file mode 100644
index 0000000..35c8c50
--- /dev/null
+++ b/smoothschedule/core/migrations/0007_add_tenant_permissions.py
@@ -0,0 +1,38 @@
+# Generated by Django 5.2.8 on 2025-11-28 07:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0006_add_can_manage_oauth_credentials'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='tenant',
+            name='can_accept_payments',
+            field=models.BooleanField(default=False, help_text='Whether this business can accept online payments via Stripe Connect'),
+        ),
+        migrations.AddField(
+            model_name='tenant',
+            name='can_api_access',
+            field=models.BooleanField(default=False, help_text='Whether this business can access the API for integrations'),
+        ),
+        migrations.AddField(
+            model_name='tenant',
+            name='can_use_custom_domain',
+            field=models.BooleanField(default=False, help_text='Whether this business can configure a custom domain'),
+        ),
+        migrations.AddField(
+            model_name='tenant',
+            name='can_white_label',
+            field=models.BooleanField(default=False, help_text='Whether this business can remove SmoothSchedule branding'),
+        ),
+        migrations.AddField(
+            model_name='tenant',
+            name='initial_setup_complete',
+            field=models.BooleanField(default=False, help_text='Whether the business has completed initial onboarding'),
+        ),
+    ]
diff --git a/smoothschedule/core/models.py b/smoothschedule/core/models.py
index b7adbbb..72dc68c 100644
--- a/smoothschedule/core/models.py
+++ b/smoothschedule/core/models.py
@@ -70,7 +70,62 @@ class Tenant(TenantMixin):
     # Metadata
     contact_email = models.EmailField(blank=True)
     phone = models.CharField(max_length=20, blank=True)
-    
+
+    # OAuth Settings - which providers are enabled for this business
+    oauth_enabled_providers = models.JSONField(
+        default=list,
+        blank=True,
+        help_text="List of enabled OAuth providers (e.g., ['google', 'facebook', 'apple'])"
+    )
+    oauth_allow_registration = models.BooleanField(
+        default=True,
+        help_text="Allow new customers to register via OAuth"
+    )
+    oauth_auto_link_by_email = models.BooleanField(
+        default=True,
+        help_text="Automatically link OAuth accounts to existing accounts with matching email"
+    )
+
+    # Custom OAuth Credentials (for businesses that want their own branding)
+    oauth_use_custom_credentials = models.BooleanField(
+        default=False,
+        help_text="Use business's own OAuth app credentials instead of platform credentials"
+    )
+    oauth_credentials = models.JSONField(
+        default=dict,
+        blank=True,
+        help_text="Custom OAuth credentials for each provider (encrypted at rest)"
+    )
+
+    # Platform-controlled permissions (set by platform admins)
+    # These are special permissions granted via tenant invitation, not included in standard tier packages
+    can_manage_oauth_credentials = models.BooleanField(
+        default=False,
+        help_text="Whether this business can manage their own OAuth credentials"
+    )
+    can_accept_payments = models.BooleanField(
+        default=False,
+        help_text="Whether this business can accept online payments via Stripe Connect"
+    )
+    can_use_custom_domain = models.BooleanField(
+        default=False,
+        help_text="Whether this business can configure a custom domain"
+    )
+    can_white_label = models.BooleanField(
+        default=False,
+        help_text="Whether this business can remove SmoothSchedule branding"
+    )
+    can_api_access = models.BooleanField(
+        default=False,
+        help_text="Whether this business can access the API for integrations"
+    )
+
+    # Onboarding tracking
+    initial_setup_complete = models.BooleanField(
+        default=False,
+        help_text="Whether the business has completed initial onboarding"
+    )
+
     # Auto-created fields from TenantMixin:
     # - schema_name (unique, indexed)
     # - auto_create_schema
diff --git a/smoothschedule/platform_admin/migrations/0001_initial.py b/smoothschedule/platform_admin/migrations/0001_initial.py
new file mode 100644
index 0000000..6bc86cc
--- /dev/null
+++ b/smoothschedule/platform_admin/migrations/0001_initial.py
@@ -0,0 +1,43 @@
+# Generated by Django 5.2.8 on 2025-11-28 08:06
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('core', '0007_add_tenant_permissions'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='TenantInvitation',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('email', models.EmailField(help_text='Email address to send invitation to', max_length=254)),
+                ('token', models.CharField(max_length=64, unique=True)),
+                ('status', models.CharField(choices=[('PENDING', 'Pending'), ('ACCEPTED', 'Accepted'), ('EXPIRED', 'Expired'), ('CANCELLED', 'Cancelled')], default='PENDING', max_length=20)),
+                ('suggested_business_name', models.CharField(blank=True, help_text='Suggested business name (owner can change during onboarding)', max_length=100)),
+                ('subscription_tier', models.CharField(choices=[('FREE', 'Free Trial'), ('STARTER', 'Starter'), ('PROFESSIONAL', 'Professional'), ('ENTERPRISE', 'Enterprise')], default='PROFESSIONAL', max_length=50)),
+                ('custom_max_users', models.IntegerField(blank=True, help_text='Custom max users limit (null = use tier default)', null=True)),
+                ('custom_max_resources', models.IntegerField(blank=True, help_text='Custom max resources limit (null = use tier default)', null=True)),
+                ('permissions', models.JSONField(blank=True, default=dict, help_text='Platform permissions to grant (e.g., can_accept_payments, can_use_custom_domain)')),
+                ('personal_message', models.TextField(blank=True, help_text='Optional personal message to include in the invitation email')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('expires_at', models.DateTimeField()),
+                ('accepted_at', models.DateTimeField(blank=True, null=True)),
+                ('created_tenant', models.ForeignKey(blank=True, help_text='Tenant created when invitation was accepted', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='invitation', to='core.tenant')),
+                ('created_user', models.ForeignKey(blank=True, help_text='Owner user created when invitation was accepted', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='tenant_invitation_accepted', to=settings.AUTH_USER_MODEL)),
+                ('invited_by', models.ForeignKey(help_text='Platform admin who sent the invitation', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='tenant_invitations_sent', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'ordering': ['-created_at'],
+                'indexes': [models.Index(fields=['token'], name='platform_ad_token_7ec24c_idx'), models.Index(fields=['email', 'status'], name='platform_ad_email_309f0f_idx'), models.Index(fields=['status', 'expires_at'], name='platform_ad_status_f2fa75_idx')],
+            },
+        ),
+    ]
diff --git a/smoothschedule/platform_admin/migrations/__init__.py b/smoothschedule/platform_admin/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/smoothschedule/platform_admin/models.py b/smoothschedule/platform_admin/models.py
new file mode 100644
index 0000000..4739c34
--- /dev/null
+++ b/smoothschedule/platform_admin/models.py
@@ -0,0 +1,217 @@
+"""
+Platform Admin Models
+Models for platform-level operations like tenant invitations
+"""
+import secrets
+from datetime import timedelta
+from django.db import models
+from django.utils import timezone
+from django.utils.translation import gettext_lazy as _
+
+
+class TenantInvitation(models.Model):
+    """
+    Invitation for new business owners to create their tenant.
+    Allows platform admins to pre-configure custom limits and permissions.
+
+    Flow:
+    1. Platform admin creates invitation with email and custom settings
+    2. System sends email with unique token link
+    3. Invitee clicks link, completes onboarding wizard
+    4. Tenant, domain, and owner user are created with pre-configured settings
+    """
+
+    class Status(models.TextChoices):
+        PENDING = 'PENDING', _('Pending')
+        ACCEPTED = 'ACCEPTED', _('Accepted')
+        EXPIRED = 'EXPIRED', _('Expired')
+        CANCELLED = 'CANCELLED', _('Cancelled')
+
+    # Invitation target
+    email = models.EmailField(help_text="Email address to send invitation to")
+    token = models.CharField(max_length=64, unique=True)
+    status = models.CharField(
+        max_length=20,
+        choices=Status.choices,
+        default=Status.PENDING
+    )
+
+    # Pre-configured business settings (owner can modify during onboarding)
+    suggested_business_name = models.CharField(
+        max_length=100,
+        blank=True,
+        help_text="Suggested business name (owner can change during onboarding)"
+    )
+
+    # Subscription settings
+    subscription_tier = models.CharField(
+        max_length=50,
+        choices=[
+            ('FREE', 'Free Trial'),
+            ('STARTER', 'Starter'),
+            ('PROFESSIONAL', 'Professional'),
+            ('ENTERPRISE', 'Enterprise'),
+        ],
+        default='PROFESSIONAL'
+    )
+
+    # Custom limits (null = use tier defaults)
+    custom_max_users = models.IntegerField(
+        null=True,
+        blank=True,
+        help_text="Custom max users limit (null = use tier default)"
+    )
+    custom_max_resources = models.IntegerField(
+        null=True,
+        blank=True,
+        help_text="Custom max resources limit (null = use tier default)"
+    )
+
+    # Platform permissions (what features this tenant can access)
+    # These are special permissions not available in normal tier packages
+    permissions = models.JSONField(
+        default=dict,
+        blank=True,
+        help_text="Platform permissions to grant (e.g., can_accept_payments, can_use_custom_domain)"
+    )
+    # Example permissions structure:
+    # {
+    #   "can_manage_oauth_credentials": true,
+    #   "can_accept_payments": true,
+    #   "can_use_custom_domain": true,
+    #   "can_white_label": false,
+    #   "can_api_access": true,
+    # }
+
+    # Personal message to include in email
+    personal_message = models.TextField(
+        blank=True,
+        help_text="Optional personal message to include in the invitation email"
+    )
+
+    # Metadata
+    invited_by = models.ForeignKey(
+        'users.User',
+        on_delete=models.SET_NULL,
+        null=True,
+        related_name='tenant_invitations_sent',
+        help_text="Platform admin who sent the invitation"
+    )
+
+    # Timestamps
+    created_at = models.DateTimeField(auto_now_add=True)
+    expires_at = models.DateTimeField()
+    accepted_at = models.DateTimeField(null=True, blank=True)
+
+    # Links to created resources (after acceptance)
+    created_tenant = models.ForeignKey(
+        'core.Tenant',
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        related_name='invitation',
+        help_text="Tenant created when invitation was accepted"
+    )
+    created_user = models.ForeignKey(
+        'users.User',
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        related_name='tenant_invitation_accepted',
+        help_text="Owner user created when invitation was accepted"
+    )
+
+    class Meta:
+        app_label = 'platform_admin'
+        ordering = ['-created_at']
+        indexes = [
+            models.Index(fields=['token']),
+            models.Index(fields=['email', 'status']),
+            models.Index(fields=['status', 'expires_at']),
+        ]
+
+    def __str__(self):
+        return f"Tenant invitation for {self.email} ({self.get_status_display()})"
+
+    def save(self, *args, **kwargs):
+        if not self.token:
+            self.token = secrets.token_urlsafe(32)
+        if not self.expires_at:
+            # Default expiration: 7 days
+            self.expires_at = timezone.now() + timedelta(days=7)
+        super().save(*args, **kwargs)
+
+    def is_valid(self):
+        """Check if invitation can still be accepted"""
+        if self.status != self.Status.PENDING:
+            return False
+        if timezone.now() > self.expires_at:
+            return False
+        return True
+
+    def accept(self, tenant, user):
+        """Mark invitation as accepted and link to created resources"""
+        self.status = self.Status.ACCEPTED
+        self.accepted_at = timezone.now()
+        self.created_tenant = tenant
+        self.created_user = user
+        self.save()
+
+    def cancel(self):
+        """Cancel a pending invitation"""
+        if self.status == self.Status.PENDING:
+            self.status = self.Status.CANCELLED
+            self.save()
+
+    def get_effective_max_users(self):
+        """Get max users (custom or tier default)"""
+        if self.custom_max_users is not None:
+            return self.custom_max_users
+        # Tier defaults
+        tier_defaults = {
+            'FREE': 2,
+            'STARTER': 5,
+            'PROFESSIONAL': 15,
+            'ENTERPRISE': 50,
+        }
+        return tier_defaults.get(self.subscription_tier, 5)
+
+    def get_effective_max_resources(self):
+        """Get max resources (custom or tier default)"""
+        if self.custom_max_resources is not None:
+            return self.custom_max_resources
+        # Tier defaults
+        tier_defaults = {
+            'FREE': 3,
+            'STARTER': 10,
+            'PROFESSIONAL': 30,
+            'ENTERPRISE': 100,
+        }
+        return tier_defaults.get(self.subscription_tier, 10)
+
+    @classmethod
+    def create_invitation(cls, email, invited_by, subscription_tier='PROFESSIONAL',
+                          suggested_business_name='', custom_max_users=None,
+                          custom_max_resources=None, permissions=None,
+                          personal_message=''):
+        """
+        Create a new tenant invitation, cancelling any existing pending invitations
+        for the same email.
+        """
+        # Cancel existing pending invitations for this email
+        cls.objects.filter(
+            email=email,
+            status=cls.Status.PENDING
+        ).update(status=cls.Status.CANCELLED)
+
+        # Create new invitation
+        return cls.objects.create(
+            email=email,
+            invited_by=invited_by,
+            subscription_tier=subscription_tier,
+            suggested_business_name=suggested_business_name,
+            custom_max_users=custom_max_users,
+            custom_max_resources=custom_max_resources,
+            permissions=permissions or {},
+            personal_message=personal_message,
+        )
diff --git a/smoothschedule/platform_admin/serializers.py b/smoothschedule/platform_admin/serializers.py
index 2e0fa53..f0bb3c9 100644
--- a/smoothschedule/platform_admin/serializers.py
+++ b/smoothschedule/platform_admin/serializers.py
@@ -5,6 +5,7 @@ Serializers for platform-level operations (viewing tenants, users, metrics)
 from rest_framework import serializers
 from core.models import Tenant, Domain
 from smoothschedule.users.models import User
+from .models import TenantInvitation
 
 
 class TenantSerializer(serializers.ModelSerializer):
@@ -19,7 +20,9 @@ class TenantSerializer(serializers.ModelSerializer):
         fields = [
             'id', 'name', 'subdomain', 'tier', 'is_active',
             'created_on', 'user_count', 'owner', 'max_users',
-            'max_resources', 'contact_email', 'phone'
+            'max_resources', 'contact_email', 'phone',
+            # Platform permissions
+            'can_manage_oauth_credentials',
         ]
         read_only_fields = fields
 
@@ -59,6 +62,162 @@ class TenantSerializer(serializers.ModelSerializer):
         return None
 
 
+class TenantUpdateSerializer(serializers.ModelSerializer):
+    """Serializer for updating Tenant permissions (platform admins only)"""
+
+    class Meta:
+        model = Tenant
+        fields = [
+            'id', 'name', 'is_active', 'subscription_tier',
+            'max_users', 'max_resources',
+            # Platform permissions
+            'can_manage_oauth_credentials',
+        ]
+        read_only_fields = ['id']
+
+    def update(self, instance, validated_data):
+        """Update tenant with validated data"""
+        from django_tenants.utils import schema_context
+
+        for attr, value in validated_data.items():
+            setattr(instance, attr, value)
+
+        # Must save in public schema
+        with schema_context('public'):
+            instance.save()
+        return instance
+
+
+class TenantCreateSerializer(serializers.Serializer):
+    """Serializer for creating a new Tenant with domain"""
+    # Required fields
+    name = serializers.CharField(max_length=100)
+    subdomain = serializers.CharField(max_length=63)  # Max subdomain length
+
+    # Optional fields with defaults
+    subscription_tier = serializers.ChoiceField(
+        choices=['FREE', 'STARTER', 'PROFESSIONAL', 'ENTERPRISE'],
+        default='FREE'
+    )
+    is_active = serializers.BooleanField(default=True)
+    max_users = serializers.IntegerField(default=5, min_value=1)
+    max_resources = serializers.IntegerField(default=10, min_value=1)
+    contact_email = serializers.EmailField(required=False, allow_blank=True)
+    phone = serializers.CharField(max_length=20, required=False, allow_blank=True)
+
+    # Platform permissions
+    can_manage_oauth_credentials = serializers.BooleanField(default=False)
+
+    # Owner details (optional - create owner user if provided)
+    owner_email = serializers.EmailField(required=False)
+    owner_name = serializers.CharField(max_length=150, required=False)
+    owner_password = serializers.CharField(max_length=128, required=False, write_only=True)
+
+    def validate_subdomain(self, value):
+        """Validate subdomain is unique and valid"""
+        import re
+
+        # Check format (lowercase alphanumeric and hyphens, must start with letter)
+        if not re.match(r'^[a-z][a-z0-9-]*$', value.lower()):
+            raise serializers.ValidationError(
+                "Subdomain must start with a letter and contain only lowercase letters, numbers, and hyphens"
+            )
+
+        # Check if subdomain already exists as schema_name
+        if Tenant.objects.filter(schema_name=value.lower()).exists():
+            raise serializers.ValidationError("This subdomain is already taken")
+
+        # Check if domain already exists
+        domain_name = f"{value.lower()}.lvh.me"  # TODO: Make base domain configurable
+        if Domain.objects.filter(domain=domain_name).exists():
+            raise serializers.ValidationError("This subdomain is already taken")
+
+        # Reserved subdomains
+        reserved = ['www', 'api', 'admin', 'platform', 'app', 'mail', 'smtp', 'ftp', 'public']
+        if value.lower() in reserved:
+            raise serializers.ValidationError("This subdomain is reserved")
+
+        return value.lower()
+
+    def validate(self, attrs):
+        """Cross-field validation"""
+        # If owner email is provided, name and password should also be provided
+        owner_email = attrs.get('owner_email')
+        owner_name = attrs.get('owner_name')
+        owner_password = attrs.get('owner_password')
+
+        if owner_email:
+            if not owner_name:
+                raise serializers.ValidationError({
+                    'owner_name': 'Owner name is required when creating an owner'
+                })
+            if not owner_password:
+                raise serializers.ValidationError({
+                    'owner_password': 'Owner password is required when creating an owner'
+                })
+            # Check if email already exists
+            if User.objects.filter(email=owner_email).exists():
+                raise serializers.ValidationError({
+                    'owner_email': 'A user with this email already exists'
+                })
+
+        return attrs
+
+    def create(self, validated_data):
+        """Create tenant, domain, and optionally owner user"""
+        from django.db import transaction
+        from django_tenants.utils import schema_context
+
+        subdomain = validated_data.pop('subdomain')
+        owner_email = validated_data.pop('owner_email', None)
+        owner_name = validated_data.pop('owner_name', None)
+        owner_password = validated_data.pop('owner_password', None)
+
+        # Must create tenant in public schema
+        with schema_context('public'):
+            with transaction.atomic():
+                # Create tenant
+                tenant = Tenant.objects.create(
+                    schema_name=subdomain,
+                    name=validated_data.get('name'),
+                    subscription_tier=validated_data.get('subscription_tier', 'FREE'),
+                    is_active=validated_data.get('is_active', True),
+                    max_users=validated_data.get('max_users', 5),
+                    max_resources=validated_data.get('max_resources', 10),
+                    contact_email=validated_data.get('contact_email', ''),
+                    phone=validated_data.get('phone', ''),
+                    can_manage_oauth_credentials=validated_data.get('can_manage_oauth_credentials', False),
+                )
+
+                # Create primary domain
+                domain_name = f"{subdomain}.lvh.me"  # TODO: Make base domain configurable
+                Domain.objects.create(
+                    domain=domain_name,
+                    tenant=tenant,
+                    is_primary=True,
+                    is_custom_domain=False,
+                )
+
+                # Create owner user if details provided
+                if owner_email and owner_name and owner_password:
+                    # Split name into first/last
+                    name_parts = owner_name.split(' ', 1)
+                    first_name = name_parts[0]
+                    last_name = name_parts[1] if len(name_parts) > 1 else ''
+
+                    owner = User.objects.create_user(
+                        username=owner_email,  # Use email as username
+                        email=owner_email,
+                        password=owner_password,
+                        first_name=first_name,
+                        last_name=last_name,
+                        role=User.Role.TENANT_OWNER,
+                        tenant=tenant,
+                    )
+
+        return tenant
+
+
 class PlatformUserSerializer(serializers.ModelSerializer):
     """Serializer for User listing (platform view)"""
     business = serializers.SerializerMethodField()
@@ -113,3 +272,109 @@ class PlatformMetricsSerializer(serializers.Serializer):
     total_users = serializers.IntegerField()
     mrr = serializers.DecimalField(max_digits=10, decimal_places=2)
     growth_rate = serializers.FloatField()
+
+
+class TenantInvitationSerializer(serializers.ModelSerializer):
+    """Serializer for TenantInvitation model"""
+    invited_by_email = serializers.ReadOnlyField(source='invited_by.email')
+    created_tenant_name = serializers.ReadOnlyField(source='created_tenant.name')
+    created_user_email = serializers.ReadOnlyField(source='created_user.email')
+
+    class Meta:
+        model = TenantInvitation
+        fields = [
+            'id', 'email', 'token', 'status', 'suggested_business_name',
+            'subscription_tier', 'custom_max_users', 'custom_max_resources',
+            'permissions', 'personal_message', 'invited_by',
+            'invited_by_email', 'created_at', 'expires_at', 'accepted_at',
+            'created_tenant', 'created_tenant_name', 'created_user', 'created_user_email',
+        ]
+        read_only_fields = ['id', 'token', 'status', 'created_at', 'expires_at', 'accepted_at',
+                            'created_tenant', 'created_tenant_name', 'created_user', 'created_user_email',
+                            'invited_by_email']
+        extra_kwargs = {
+            'invited_by': {'write_only': True}, # Only send on creation
+        }
+
+    def validate_permissions(self, value):
+        """Validate that permissions is a dictionary with boolean values"""
+        if not isinstance(value, dict):
+            raise serializers.ValidationError("Permissions must be a dictionary.")
+        for key, val in value.items():
+            if not isinstance(val, bool):
+                raise serializers.ValidationError(f"Permission '{key}' must be a boolean.")
+        return value
+
+
+class TenantInvitationCreateSerializer(serializers.ModelSerializer):
+    """Serializer for creating TenantInvitations - sets invited_by automatically"""
+    class Meta:
+        model = TenantInvitation
+        fields = [
+            'email', 'suggested_business_name', 'subscription_tier',
+            'custom_max_users', 'custom_max_resources', 'permissions',
+            'personal_message',
+        ]
+
+    def create(self, validated_data):
+        validated_data['invited_by'] = self.context['request'].user
+        return super().create(validated_data)
+
+
+class TenantInvitationAcceptSerializer(serializers.Serializer):
+    """Serializer for accepting a TenantInvitation"""
+    email = serializers.EmailField()
+    password = serializers.CharField(max_length=128, write_only=True)
+    first_name = serializers.CharField(max_length=150)
+    last_name = serializers.CharField(max_length=150)
+    business_name = serializers.CharField(max_length=100)
+    subdomain = serializers.CharField(max_length=63)
+    contact_email = serializers.EmailField(required=False, allow_blank=True)
+    phone = serializers.CharField(max_length=20, required=False, allow_blank=True)
+
+    def validate_subdomain(self, value):
+        """Validate subdomain is unique and valid"""
+        import re
+        from core.models import Tenant, Domain
+
+        # Check format (lowercase alphanumeric and hyphens, must start with letter)
+        if not re.match(r'^[a-z][a-z0-9-]*$', value.lower()):
+            raise serializers.ValidationError(
+                "Subdomain must start with a letter and contain only lowercase letters, numbers, and hyphens"
+            )
+
+        # Check if subdomain already exists as schema_name
+        if Tenant.objects.filter(schema_name=value.lower()).exists():
+            raise serializers.ValidationError("This subdomain is already taken")
+
+        # Check if domain already exists
+        domain_name = f"{value.lower()}.lvh.me"  # TODO: Make base domain configurable
+        if Domain.objects.filter(domain=domain_name).exists():
+            raise serializers.ValidationError("This subdomain is already taken")
+
+        # Reserved subdomains
+        reserved = ['www', 'api', 'admin', 'platform', 'app', 'mail', 'smtp', 'ftp', 'public']
+        if value.lower() in reserved:
+            raise serializers.ValidationError("This subdomain is reserved")
+
+        return value.lower()
+
+    def validate_email(self, value):
+        """Validate email is unique for owner user"""
+        if User.objects.filter(email=value).exists():
+            raise serializers.ValidationError("A user with this email already exists.")
+        return value
+
+
+class TenantInvitationDetailSerializer(TenantInvitationSerializer):
+    """Serializer to display invitation details without requiring authentication"""
+    class Meta(TenantInvitationSerializer.Meta):
+        read_only_fields = ['id', 'email', 'token', 'status', 'suggested_business_name',
+                            'subscription_tier', 'custom_max_users', 'custom_max_resources',
+                            'permissions', 'personal_message', 'created_at', 'expires_at',
+                            'accepted_at', 'created_tenant', 'created_user', 'invited_by_email',
+                            'created_tenant_name', 'created_user_email']
+        extra_kwargs = {
+            'invited_by': {'read_only': True},
+        }
+
diff --git a/smoothschedule/platform_admin/urls.py b/smoothschedule/platform_admin/urls.py
index 31d52b1..c693002 100644
--- a/smoothschedule/platform_admin/urls.py
+++ b/smoothschedule/platform_admin/urls.py
@@ -3,14 +3,26 @@ Platform URL Configuration
 """
 from django.urls import path, include
 from rest_framework.routers import DefaultRouter
-from .views import TenantViewSet, PlatformUserViewSet
+from .views import TenantViewSet, PlatformUserViewSet, TenantInvitationViewSet
 
 app_name = 'platform'
 
 router = DefaultRouter()
 router.register(r'businesses', TenantViewSet, basename='business')
 router.register(r'users', PlatformUserViewSet, basename='user')
+router.register(r'tenant-invitations', TenantInvitationViewSet, basename='tenant-invitation')
 
 urlpatterns = [
     path('', include(router.urls)),
+    # Public endpoints for tenant invitations
+    path(
+        'tenant-invitations/token/<str:token>/',
+        TenantInvitationViewSet.as_view({'get': 'retrieve_by_token'}),
+        name='tenant-invitation-retrieve-by-token'
+    ),
+    path(
+        'tenant-invitations/token/<str:token>/accept/',
+        TenantInvitationViewSet.as_view({'post': 'accept'}),
+        name='tenant-invitation-accept'
+    ),
 ]
diff --git a/smoothschedule/platform_admin/views.py b/smoothschedule/platform_admin/views.py
index 6033106..aaa28a3 100644
--- a/smoothschedule/platform_admin/views.py
+++ b/smoothschedule/platform_admin/views.py
@@ -2,26 +2,44 @@
 Platform Views
 API views for platform-level operations
 """
+import secrets
+from datetime import timedelta
+
 from rest_framework import viewsets, status
 from rest_framework.decorators import action
 from rest_framework.response import Response
 from rest_framework.permissions import IsAuthenticated
 from django.db.models import Count
+from django.db import transaction, connection
+from django.utils import timezone
+from django_tenants.utils import schema_context
 
-from core.models import Tenant
+from core.models import Tenant, Domain
 from smoothschedule.users.models import User
-from .serializers import TenantSerializer, PlatformUserSerializer, PlatformMetricsSerializer
+from .models import TenantInvitation
+from .serializers import (
+    TenantSerializer,
+    TenantCreateSerializer,
+    TenantUpdateSerializer,
+    PlatformUserSerializer,
+    PlatformMetricsSerializer,
+    TenantInvitationSerializer,
+    TenantInvitationCreateSerializer,
+    TenantInvitationAcceptSerializer,
+    TenantInvitationDetailSerializer
+)
 from .permissions import IsPlatformAdmin, IsPlatformUser
 
 
-class TenantViewSet(viewsets.ReadOnlyModelViewSet):
+class TenantViewSet(viewsets.ModelViewSet):
     """
-    ViewSet for viewing tenants (businesses).
+    ViewSet for viewing, creating, and updating tenants (businesses).
     Platform admins only.
     """
     queryset = Tenant.objects.all().order_by('-created_on')
     serializer_class = TenantSerializer
     permission_classes = [IsAuthenticated, IsPlatformAdmin]
+    http_method_names = ['get', 'post', 'patch', 'head', 'options']  # Allow GET, POST, and PATCH
 
     def get_queryset(self):
         """Optionally filter by active status"""
@@ -31,6 +49,14 @@ class TenantViewSet(viewsets.ReadOnlyModelViewSet):
             queryset = queryset.filter(is_active=is_active.lower() == 'true')
         return queryset
 
+    def get_serializer_class(self):
+        """Use different serializer for different actions"""
+        if self.action == 'create':
+            return TenantCreateSerializer
+        if self.action in ['partial_update', 'update']:
+            return TenantUpdateSerializer
+        return TenantSerializer
+
     @action(detail=False, methods=['get'])
     def metrics(self, request):
         """Get platform-wide tenant metrics"""
@@ -49,6 +75,7 @@ class TenantViewSet(viewsets.ReadOnlyModelViewSet):
         return Response(serializer.data)
 
 
+
 class PlatformUserViewSet(viewsets.ReadOnlyModelViewSet):
     """
     ViewSet for viewing all users across the platform.
@@ -75,3 +102,136 @@ class PlatformUserViewSet(viewsets.ReadOnlyModelViewSet):
         # TODO: Filter by business when we add tenant reference to User
 
         return queryset
+
+
+class TenantInvitationViewSet(viewsets.ModelViewSet):
+    """
+    ViewSet for managing Tenant Invitations.
+    Platform admins only for all actions except token-based retrieval and acceptance.
+    """
+    queryset = TenantInvitation.objects.all().order_by('-created_at')
+    serializer_class = TenantInvitationSerializer
+    permission_classes = [IsAuthenticated, IsPlatformAdmin]
+    http_method_names = ['get', 'post', 'delete', 'head', 'options']
+
+    def get_serializer_class(self):
+        if self.action == 'create':
+            return TenantInvitationCreateSerializer
+        return TenantInvitationSerializer
+
+    def perform_create(self, serializer):
+        # The create method on the model will handle cancelling old invitations
+        # and generating token/expires_at.
+        instance = serializer.save(invited_by=self.request.user)
+        # TODO: Send invitation email here (e.g., using Celery task)
+        # Placeholder for email sending:
+        # from .tasks import send_invitation_email
+        # send_invitation_email.delay(instance.id)
+
+    @action(detail=True, methods=['post'])
+    def resend(self, request, pk=None):
+        """Resend invitation email for a specific invitation."""
+        invitation = self.get_object()
+        if not invitation.is_valid():
+            return Response(
+                {"detail": "Invitation is not in a valid state to be resent."},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+        # Update expires_at and token for resend (optional, but good practice)
+        invitation.expires_at = timezone.now() + timedelta(days=7)
+        invitation.token = secrets.token_urlsafe(32) # Generate new token
+        invitation.save()
+
+        # TODO: Send invitation email here (e.g., using Celery task)
+        # Placeholder for email sending:
+        # from .tasks import send_invitation_email
+        # send_invitation_email.delay(invitation.id)
+        return Response({"detail": "Invitation email resent successfully."}, status=status.HTTP_200_OK)
+
+    @action(detail=True, methods=['post'])
+    def cancel(self, request, pk=None):
+        """Cancel a pending invitation."""
+        invitation = self.get_object()
+        if invitation.status == TenantInvitation.Status.PENDING:
+            invitation.cancel()
+            return Response({"detail": "Invitation cancelled successfully."}, status=status.HTTP_200_OK)
+        return Response(
+            {"detail": "Only pending invitations can be cancelled."},
+            status=status.HTTP_400_BAD_REQUEST
+        )
+
+    # Public actions (no authentication required, accessible via token)
+    @action(detail=False, methods=['get'], url_path='token/(?P<token>[^/.]+)', permission_classes=[])
+    def retrieve_by_token(self, request, token=None):
+        """Retrieve invitation details using a public token."""
+        try:
+            invitation = TenantInvitation.objects.get(token=token)
+        except TenantInvitation.DoesNotExist:
+            return Response({"detail": "Invitation not found or invalid token."}, status=status.HTTP_404_NOT_FOUND)
+
+        if not invitation.is_valid():
+            return Response({"detail": "Invitation is no longer valid."}, status=status.HTTP_400_BAD_REQUEST)
+
+        serializer = TenantInvitationDetailSerializer(invitation)
+        return Response(serializer.data)
+
+    @action(detail=False, methods=['post'], url_path='token/(?P<token>[^/.]+)/accept', permission_classes=[])
+    def accept(self, request, token=None):
+        """Accept an invitation, create tenant and owner user."""
+        try:
+            invitation = TenantInvitation.objects.get(token=token)
+        except TenantInvitation.DoesNotExist:
+            return Response({"detail": "Invitation not found or invalid token."}, status=status.HTTP_404_NOT_FOUND)
+
+        if not invitation.is_valid():
+            return Response({"detail": "Invitation is no longer valid."}, status=status.HTTP_400_BAD_REQUEST)
+
+        serializer = TenantInvitationAcceptSerializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+
+        # Force execution in public schema for tenant creation
+        with schema_context('public'):
+            with transaction.atomic():
+                # Create Tenant
+                subdomain = serializer.validated_data['subdomain'].lower()
+                tenant = Tenant.objects.create(
+                    schema_name=subdomain,
+                    name=serializer.validated_data['business_name'],
+                    subscription_tier=invitation.subscription_tier,
+                    max_users=invitation.get_effective_max_users(),
+                    max_resources=invitation.get_effective_max_resources(),
+                    contact_email=serializer.validated_data.get('contact_email', invitation.email),
+                    phone=serializer.validated_data.get('phone', ''),
+                    # Set platform permissions from invitation
+                    can_manage_oauth_credentials=invitation.permissions.get('can_manage_oauth_credentials', False),
+                    can_accept_payments=invitation.permissions.get('can_accept_payments', False),
+                    can_use_custom_domain=invitation.permissions.get('can_use_custom_domain', False),
+                    can_white_label=invitation.permissions.get('can_white_label', False),
+                    can_api_access=invitation.permissions.get('can_api_access', False),
+                    initial_setup_complete=True, # Mark as complete after onboarding
+                )
+
+                # Create primary domain
+                domain_name = f"{subdomain}.lvh.me"  # TODO: Make base domain configurable
+                Domain.objects.create(
+                    domain=domain_name,
+                    tenant=tenant,
+                    is_primary=True,
+                    is_custom_domain=False,
+                )
+
+                # Create Owner User
+                owner_user = User.objects.create_user(
+                    username=serializer.validated_data['email'],
+                    email=serializer.validated_data['email'],
+                    password=serializer.validated_data['password'],
+                    first_name=serializer.validated_data['first_name'],
+                    last_name=serializer.validated_data['last_name'],
+                    role=User.Role.TENANT_OWNER,
+                    tenant=tenant,
+                )
+
+                # Mark invitation as accepted
+                invitation.accept(tenant, owner_user)
+
+        return Response({"detail": "Invitation accepted, tenant and user created."}, status=status.HTTP_201_CREATED)
diff --git a/smoothschedule/schedule/api_views.py b/smoothschedule/schedule/api_views.py
index 8733250..c4c6513 100644
--- a/smoothschedule/schedule/api_views.py
+++ b/smoothschedule/schedule/api_views.py
@@ -57,6 +57,8 @@ def current_business_view(request):
         'initial_setup_complete': False,
         'website_pages': {},
         'customer_dashboard_content': [],
+        # Platform permissions
+        'can_manage_oauth_credentials': tenant.can_manage_oauth_credentials,
     }
 
     return Response(business_data, status=status.HTTP_200_OK)
@@ -165,4 +167,183 @@ def update_business_view(request):
         'customer_dashboard_content': [],
     }
 
-    return Response(business_data, status=status.HTTP_200_OK)
+    return Response(business_data)
+
+
+# Available OAuth providers that the platform supports
+AVAILABLE_OAUTH_PROVIDERS = [
+    {
+        'id': 'google',
+        'name': 'Google',
+        'icon': 'google',
+        'description': 'Sign in with Google accounts',
+    },
+    {
+        'id': 'facebook',
+        'name': 'Facebook',
+        'icon': 'facebook',
+        'description': 'Sign in with Facebook accounts',
+    },
+    {
+        'id': 'apple',
+        'name': 'Apple',
+        'icon': 'apple',
+        'description': 'Sign in with Apple ID',
+    },
+]
+
+
+@api_view(['GET', 'PATCH'])
+@permission_classes([IsAuthenticated])
+def oauth_settings_view(request):
+    """
+    Get or update OAuth settings for the current business
+    GET /api/business/oauth-settings/
+    PATCH /api/business/oauth-settings/
+    """
+    user = request.user
+    tenant = user.tenant
+
+    # Platform users don't have a tenant
+    if not tenant:
+        return Response({'error': 'No business found'}, status=status.HTTP_404_NOT_FOUND)
+
+    if request.method == 'GET':
+        return Response({
+            'settings': {
+                'enabled_providers': tenant.oauth_enabled_providers or [],
+                'allow_registration': tenant.oauth_allow_registration,
+                'auto_link_by_email': tenant.oauth_auto_link_by_email,
+                'use_custom_credentials': tenant.oauth_use_custom_credentials,
+            },
+            'available_providers': AVAILABLE_OAUTH_PROVIDERS,
+        }, status=status.HTTP_200_OK)
+
+    # PATCH - update settings
+    # Only owners can update OAuth settings
+    if user.role.lower() != 'tenant_owner':
+        return Response({'error': 'Only business owners can update OAuth settings'}, status=status.HTTP_403_FORBIDDEN)
+
+    data = request.data
+
+    if 'enabled_providers' in data:
+        # Validate that all providers are valid
+        valid_provider_ids = [p['id'] for p in AVAILABLE_OAUTH_PROVIDERS]
+        enabled = data['enabled_providers']
+        if not isinstance(enabled, list):
+            return Response({'error': 'enabled_providers must be a list'}, status=status.HTTP_400_BAD_REQUEST)
+        for provider in enabled:
+            if provider not in valid_provider_ids:
+                return Response({'error': f'Invalid provider: {provider}'}, status=status.HTTP_400_BAD_REQUEST)
+        tenant.oauth_enabled_providers = enabled
+
+    if 'allow_registration' in data:
+        tenant.oauth_allow_registration = bool(data['allow_registration'])
+
+    if 'auto_link_by_email' in data:
+        tenant.oauth_auto_link_by_email = bool(data['auto_link_by_email'])
+
+    if 'use_custom_credentials' in data:
+        tenant.oauth_use_custom_credentials = bool(data['use_custom_credentials'])
+
+    tenant.save()
+
+    return Response({
+        'settings': {
+            'enabled_providers': tenant.oauth_enabled_providers or [],
+            'allow_registration': tenant.oauth_allow_registration,
+            'auto_link_by_email': tenant.oauth_auto_link_by_email,
+            'use_custom_credentials': tenant.oauth_use_custom_credentials,
+        },
+        'available_providers': AVAILABLE_OAUTH_PROVIDERS,
+    }, status=status.HTTP_200_OK)
+
+
+@api_view(['GET', 'PATCH'])
+@permission_classes([IsAuthenticated])
+def oauth_credentials_view(request):
+    """
+    Get or update custom OAuth credentials for the current business
+    GET /api/business/oauth-credentials/
+    PATCH /api/business/oauth-credentials/
+
+    Credentials are stored per-provider:
+    {
+        "google": {"client_id": "...", "client_secret": "..."},
+        "facebook": {"client_id": "...", "client_secret": "..."},
+        ...
+    }
+    """
+    user = request.user
+    tenant = user.tenant
+
+    # Platform users don't have a tenant
+    if not tenant:
+        return Response({'error': 'No business found'}, status=status.HTTP_404_NOT_FOUND)
+
+    # Only owners can view/update credentials
+    if user.role.lower() != 'tenant_owner':
+        return Response({'error': 'Only business owners can manage OAuth credentials'}, status=status.HTTP_403_FORBIDDEN)
+
+    if request.method == 'GET':
+        # Return credentials with secrets masked
+        credentials = tenant.oauth_credentials or {}
+        masked_credentials = {}
+        for provider, creds in credentials.items():
+            masked_credentials[provider] = {
+                'client_id': creds.get('client_id', ''),
+                # Mask the secret - show first 4 chars if set
+                'client_secret': ('****' + creds.get('client_secret', '')[-4:]) if creds.get('client_secret') else '',
+                'has_secret': bool(creds.get('client_secret')),
+            }
+        return Response({
+            'credentials': masked_credentials,
+            'use_custom_credentials': tenant.oauth_use_custom_credentials,
+        }, status=status.HTTP_200_OK)
+
+    # PATCH - update credentials
+    data = request.data
+    valid_provider_ids = [p['id'] for p in AVAILABLE_OAUTH_PROVIDERS]
+
+    if 'credentials' in data:
+        credentials = data['credentials']
+        if not isinstance(credentials, dict):
+            return Response({'error': 'credentials must be an object'}, status=status.HTTP_400_BAD_REQUEST)
+
+        # Merge with existing credentials (don't overwrite secrets if not provided)
+        existing_credentials = tenant.oauth_credentials or {}
+        for provider, creds in credentials.items():
+            if provider not in valid_provider_ids:
+                return Response({'error': f'Invalid provider: {provider}'}, status=status.HTTP_400_BAD_REQUEST)
+
+            if provider not in existing_credentials:
+                existing_credentials[provider] = {}
+
+            if 'client_id' in creds:
+                existing_credentials[provider]['client_id'] = creds['client_id']
+
+            # Only update secret if provided and not masked value
+            if 'client_secret' in creds and creds['client_secret'] and not creds['client_secret'].startswith('****'):
+                existing_credentials[provider]['client_secret'] = creds['client_secret']
+
+        tenant.oauth_credentials = existing_credentials
+
+    if 'use_custom_credentials' in data:
+        tenant.oauth_use_custom_credentials = bool(data['use_custom_credentials'])
+
+    tenant.save()
+
+    # Return masked credentials
+    credentials = tenant.oauth_credentials or {}
+    masked_credentials = {}
+    for provider, creds in credentials.items():
+        masked_credentials[provider] = {
+            'client_id': creds.get('client_id', ''),
+            'client_secret': ('****' + creds.get('client_secret', '')[-4:]) if creds.get('client_secret') else '',
+            'has_secret': bool(creds.get('client_secret')),
+        }
+
+    return Response({
+        'credentials': masked_credentials,
+        'use_custom_credentials': tenant.oauth_use_custom_credentials,
+    }, status=status.HTTP_200_OK)