diff --git a/src/main/java/net/siegeln/cameleer/saas/account/AccountService.java b/src/main/java/net/siegeln/cameleer/saas/account/AccountService.java
index 62483a2..669c621 100644
--- a/src/main/java/net/siegeln/cameleer/saas/account/AccountService.java
+++ b/src/main/java/net/siegeln/cameleer/saas/account/AccountService.java
@@ -46,10 +46,12 @@ public class AccountService {
         if (user == null) {
             throw new ResponseStatusException(HttpStatus.NOT_FOUND, "User not found");
         }
+        Object nameVal = user.get("name");
+        Object emailVal = user.get("primaryEmail");
         return new ProfileData(
                 userId,
-                String.valueOf(user.getOrDefault("name", "")),
-                String.valueOf(user.getOrDefault("primaryEmail", ""))
+                nameVal != null ? String.valueOf(nameVal) : "",
+                emailVal != null ? String.valueOf(emailVal) : ""
         );
     }
 
diff --git a/ui/src/pages/OnboardingPage.tsx b/ui/src/pages/OnboardingPage.tsx
index 5f2ecd7..f78b16d 100644
--- a/ui/src/pages/OnboardingPage.tsx
+++ b/ui/src/pages/OnboardingPage.tsx
@@ -20,7 +20,6 @@ export function OnboardingPage() {
   const [error, setError] = useState<string | null>(null);
   const [slugAvailable, setSlugAvailable] = useState<boolean | null>(null);
   const [checkingSlug, setCheckingSlug] = useState(false);
-  const [showPasskeyOffer, setShowPasskeyOffer] = useState(false);
   const debounceRef = useRef<ReturnType<typeof setTimeout>>(undefined);
 
   const slug = toSlug(name);
@@ -51,17 +50,6 @@ export function OnboardingPage() {
     setLoading(true);
     try {
       await api.post<TenantResponse>('/onboarding/tenant', { name, slug });
-      // Check if passkeys are enabled in vendor policy
-      try {
-        const config = await fetch('/platform/api/config').then(r => r.json());
-        if (config.vendorAuthPolicy?.passkeyEnabled) {
-          setShowPasskeyOffer(true);
-          setLoading(false);
-          return; // Don't redirect yet
-        }
-      } catch {
-        // Ignore — proceed without passkey offer
-      }
       // Tenant created — force a fresh OIDC sign-in so the Logto SDK gets
       // new tokens that include the org membership just created. The existing
       // Logto session cookie means the user won't see a login form — Logto
@@ -78,34 +66,6 @@ export function OnboardingPage() {
     }
   }
 
-  async function handleSkipPasskey() {
-    await signIn(`${window.location.origin}/platform/callback`);
-  }
-
-  if (showPasskeyOffer) {
-    return (
-      <div className={styles.page}>
-        <div className={styles.wrapper}>
-          <Card className={styles.card}>
-            <div className={styles.inner}>
-              <div style={{ textAlign: 'center' }}>
-                <h2 style={{ margin: '16px 0 8px' }}>Secure your account</h2>
-                <p style={{ color: 'var(--text-muted)', marginBottom: 24 }}>
-                  Add a passkey to sign in faster with your fingerprint, face, or security key.
-                </p>
-              </div>
-              <div style={{ display: 'flex', flexDirection: 'column', gap: 12 }}>
-                <Button variant="secondary" onClick={handleSkipPasskey}>
-                  Set up later
-                </Button>
-              </div>
-            </div>
-          </Card>
-        </div>
-      </div>
-    );
-  }
-
   return (
     <div className={styles.page}>
       <div className={styles.wrapper}>
diff --git a/ui/src/pages/tenant/SettingsPage.tsx b/ui/src/pages/tenant/SettingsPage.tsx
index 3a22e7c..eecc411 100644
--- a/ui/src/pages/tenant/SettingsPage.tsx
+++ b/ui/src/pages/tenant/SettingsPage.tsx
@@ -212,7 +212,7 @@ export function SettingsPage() {
   }
 
   return (
-    <div style={{ padding: 24, display: 'flex', flexDirection: 'column', gap: 20 }}>
+    <div style={{ padding: 24, display: 'flex', flexDirection: 'column', gap: 20, overflowY: 'auto', flex: 1 }}>
       <h1 style={{ margin: 0, fontSize: '1.25rem', fontWeight: 600 }}>Settings</h1>
       <PasskeyNudgeBanner />