diff --git a/src/app/(auth)/onboarding/page.tsx b/src/app/(auth)/onboarding/page.tsx
index bf4c5db..f3178c9 100644
--- a/src/app/(auth)/onboarding/page.tsx
+++ b/src/app/(auth)/onboarding/page.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { useState } from 'react'
+import { useState, useMemo } from 'react'
 import { useRouter } from 'next/navigation'
 import { trpc } from '@/lib/trpc/client'
 import { Button } from '@/components/ui/button'
@@ -48,10 +48,23 @@ export default function OnboardingPage() {
     'EMAIL' | 'WHATSAPP' | 'BOTH' | 'NONE'
   >('EMAIL')
 
+  // Fetch feature flags
+  const { data: featureFlags } = trpc.settings.getFeatureFlags.useQuery()
+  const whatsappEnabled = featureFlags?.whatsappEnabled ?? false
+
   const completeOnboarding = trpc.user.completeOnboarding.useMutation()
 
-  const steps: Step[] = ['name', 'phone', 'tags', 'preferences', 'complete']
+  // Dynamic steps based on WhatsApp availability
+  const steps: Step[] = useMemo(() => {
+    if (whatsappEnabled) {
+      return ['name', 'phone', 'tags', 'preferences', 'complete']
+    }
+    // Skip phone step if WhatsApp is disabled
+    return ['name', 'tags', 'preferences', 'complete']
+  }, [whatsappEnabled])
+
   const currentIndex = steps.indexOf(step)
+  const totalVisibleSteps = steps.length - 1 // Exclude 'complete' from count
 
   const goNext = () => {
     if (step === 'name' && !name.trim()) {
@@ -92,8 +105,8 @@ export default function OnboardingPage() {
   }
 
   return (
-    <div className="min-h-screen flex items-center justify-center p-4 bg-gradient-to-br from-[#053d57] to-[#557f8c]">
-      <Card className="w-full max-w-lg">
+    <div className="absolute inset-0 -m-4 flex items-center justify-center p-4 md:p-8 bg-gradient-to-br from-[#053d57] to-[#557f8c]">
+      <Card className="w-full max-w-lg max-h-[85vh] overflow-y-auto shadow-2xl">
         {/* Progress indicator */}
         <div className="px-6 pt-6">
           <div className="flex items-center gap-2">
@@ -112,7 +125,7 @@ export default function OnboardingPage() {
             ))}
           </div>
           <p className="text-sm text-muted-foreground mt-2">
-            Step {currentIndex + 1} of {steps.length - 1}
+            Step {currentIndex + 1} of {totalVisibleSteps}
           </p>
         </div>
 
@@ -148,8 +161,8 @@ export default function OnboardingPage() {
           </>
         )}
 
-        {/* Step 2: Phone */}
-        {step === 'phone' && (
+        {/* Step 2: Phone (only if WhatsApp enabled) */}
+        {step === 'phone' && whatsappEnabled && (
           <>
             <CardHeader>
               <CardTitle className="flex items-center gap-2">
@@ -248,16 +261,20 @@ export default function OnboardingPage() {
                   </SelectTrigger>
                   <SelectContent>
                     <SelectItem value="EMAIL">Email only</SelectItem>
-                    <SelectItem value="WHATSAPP" disabled={!phoneNumber}>
-                      WhatsApp only
-                    </SelectItem>
-                    <SelectItem value="BOTH" disabled={!phoneNumber}>
-                      Both Email and WhatsApp
-                    </SelectItem>
+                    {whatsappEnabled && (
+                      <>
+                        <SelectItem value="WHATSAPP" disabled={!phoneNumber}>
+                          WhatsApp only
+                        </SelectItem>
+                        <SelectItem value="BOTH" disabled={!phoneNumber}>
+                          Both Email and WhatsApp
+                        </SelectItem>
+                      </>
+                    )}
                     <SelectItem value="NONE">No notifications</SelectItem>
                   </SelectContent>
                 </Select>
-                {!phoneNumber && (
+                {whatsappEnabled && !phoneNumber && (
                   <p className="text-xs text-muted-foreground">
                     Add a phone number to enable WhatsApp notifications
                   </p>
@@ -270,7 +287,7 @@ export default function OnboardingPage() {
                   <p>
                     <span className="text-muted-foreground">Name:</span> {name}
                   </p>
-                  {phoneNumber && (
+                  {whatsappEnabled && phoneNumber && (
                     <p>
                       <span className="text-muted-foreground">Phone:</span>{' '}
                       {phoneNumber}
diff --git a/src/server/routers/settings.ts b/src/server/routers/settings.ts
index 9a65b4f..0128b90 100644
--- a/src/server/routers/settings.ts
+++ b/src/server/routers/settings.ts
@@ -19,6 +19,22 @@ function categorizeModel(modelId: string): string {
 }
 
 export const settingsRouter = router({
+  /**
+   * Get public feature flags (no auth required)
+   * These are non-sensitive settings that can be exposed to any user
+   */
+  getFeatureFlags: protectedProcedure.query(async ({ ctx }) => {
+    const [whatsappEnabled] = await Promise.all([
+      ctx.prisma.systemSettings.findUnique({
+        where: { key: 'whatsapp_enabled' },
+      }),
+    ])
+
+    return {
+      whatsappEnabled: whatsappEnabled?.value === 'true',
+    }
+  }),
+
   /**
    * Get all settings by category
    */