diff --git a/frontend/src/pages/welcome/WelcomeStep2.tsx b/frontend/src/pages/welcome/WelcomeStep2.tsx
index 1b803894..c5f84805 100644
--- a/frontend/src/pages/welcome/WelcomeStep2.tsx
+++ b/frontend/src/pages/welcome/WelcomeStep2.tsx
@@ -1,5 +1,5 @@
 import { useState } from 'react'
-import { Link, useNavigate } from 'react-router-dom'
+import { useNavigate } from 'react-router-dom'
 import { Loader2 } from 'lucide-react'
 import { useAuthStore } from '@/store/authStore'
 import { onboardingApi, type PrimaryPsa } from '@/api/onboarding'
@@ -14,21 +14,24 @@ const PSA_OPTIONS: { value: PrimaryPsa; label: string; description: string }[] =
 
 /**
  * `/welcome/step-2` — second step of the welcome wizard. Captures the PSA the
- * shop primarily uses. Selecting a non-`none` tile reveals a quiet "Connect
- * now" link that navigates out to `/account/integrations`. The wizard's
- * primary action is "Continue" — credential entry is intentionally OUT of
- * the wizard (per spec).
+ * shop primarily uses. Selecting a non-`none` tile splits the primary CTA
+ * into "Connect <PSA> now" (routes to `/account/integrations` after saving)
+ * and "Connect later" (continues to step 3). Both paths persist the
+ * `primary_psa` choice before navigating.
  */
 export function WelcomeStep2() {
   const navigate = useNavigate()
   const fetchUser = useAuthStore((s) => s.fetchUser)
 
   const [primaryPsa, setPrimaryPsa] = useState<PrimaryPsa | null>(null)
-  const [submitting, setSubmitting] = useState<'continue' | 'skip' | 'dismiss' | null>(null)
+  const [submitting, setSubmitting] = useState<
+    'continue' | 'connect-now' | 'skip' | 'dismiss' | null
+  >(null)
   const [error, setError] = useState<string | null>(null)
 
   const isBusy = submitting !== null
   const showConnectNow = primaryPsa !== null && primaryPsa !== 'none'
+  const selectedPsaLabel = PSA_OPTIONS.find((o) => o.value === primaryPsa)?.label
 
   const handleContinue = async () => {
     if (isBusy) return
@@ -48,6 +51,24 @@ export function WelcomeStep2() {
     }
   }
 
+  const handleConnectNow = async () => {
+    if (isBusy || !showConnectNow) return
+    setError(null)
+    setSubmitting('connect-now')
+    try {
+      await onboardingApi.updateStep({
+        step: 2,
+        action: 'complete',
+        data: { primary_psa: primaryPsa! },
+      })
+      await fetchUser()
+      navigate('/account/integrations')
+    } catch {
+      setError('Could not save. Please try again.')
+      setSubmitting(null)
+    }
+  }
+
   const handleSkipStep = async () => {
     if (isBusy) return
     setError(null)
@@ -131,42 +152,69 @@ export function WelcomeStep2() {
           })}
         </div>
 
-        {showConnectNow && (
-          <div className="pt-1">
-            <Link
-              to="/account/integrations"
-              data-testid="welcome-step-2-connect-now"
-              className="text-xs text-muted-foreground hover:underline"
-            >
-              Connect now &rarr;
-            </Link>
-          </div>
-        )}
-
         {error && (
           <p className="text-xs text-red-400" data-testid="welcome-step-2-error">
             {error}
           </p>
         )}
 
-        <div className="flex items-center gap-3 pt-2">
-          <button
-            type="button"
-            onClick={handleContinue}
-            disabled={isBusy}
-            data-testid="welcome-step-2-continue"
-            className={cn(
-              'inline-flex items-center justify-center gap-2 rounded-xl px-4 py-2.5 text-sm font-semibold btn-press',
-              'bg-primary text-primary-foreground hover:bg-primary/90',
-              'focus:outline-hidden focus:ring-2 focus:ring-primary/30',
-              'disabled:opacity-60',
-            )}
-          >
-            {submitting === 'continue' && (
-              <Loader2 className="h-4 w-4 animate-spin" />
-            )}
-            Continue
-          </button>
+        <div className="flex flex-wrap items-center gap-3 pt-2">
+          {showConnectNow ? (
+            <>
+              <button
+                type="button"
+                onClick={handleConnectNow}
+                disabled={isBusy}
+                data-testid="welcome-step-2-connect-now"
+                className={cn(
+                  'inline-flex items-center justify-center gap-2 rounded-xl px-4 py-2.5 text-sm font-semibold btn-press',
+                  'bg-primary text-primary-foreground hover:bg-primary/90',
+                  'focus:outline-hidden focus:ring-2 focus:ring-primary/30',
+                  'disabled:opacity-60',
+                )}
+              >
+                {submitting === 'connect-now' && (
+                  <Loader2 className="h-4 w-4 animate-spin" />
+                )}
+                Connect {selectedPsaLabel} now
+              </button>
+              <button
+                type="button"
+                onClick={handleContinue}
+                disabled={isBusy}
+                data-testid="welcome-step-2-continue"
+                className={cn(
+                  'inline-flex items-center justify-center gap-2 rounded-xl px-4 py-2.5 text-sm font-medium btn-press',
+                  'bg-card border border-border text-foreground hover:bg-foreground/5',
+                  'focus:outline-hidden focus:ring-2 focus:ring-primary/20',
+                  'disabled:opacity-60',
+                )}
+              >
+                {submitting === 'continue' && (
+                  <Loader2 className="h-4 w-4 animate-spin" />
+                )}
+                Connect later
+              </button>
+            </>
+          ) : (
+            <button
+              type="button"
+              onClick={handleContinue}
+              disabled={isBusy}
+              data-testid="welcome-step-2-continue"
+              className={cn(
+                'inline-flex items-center justify-center gap-2 rounded-xl px-4 py-2.5 text-sm font-semibold btn-press',
+                'bg-primary text-primary-foreground hover:bg-primary/90',
+                'focus:outline-hidden focus:ring-2 focus:ring-primary/30',
+                'disabled:opacity-60',
+              )}
+            >
+              {submitting === 'continue' && (
+                <Loader2 className="h-4 w-4 animate-spin" />
+              )}
+              Continue
+            </button>
+          )}
           <button
             type="button"
             onClick={handleSkipStep}