diff --git a/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/(overview)/setup-page.tsx b/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/(overview)/setup-page.tsx
index c704b93e0..63c7d0344 100644
--- a/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/(overview)/setup-page.tsx
+++ b/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/(overview)/setup-page.tsx
@@ -577,7 +577,6 @@ export default function SetupPage(props: { toMetrics: () => void }) {
     }
   ];
 
-  const selectedInstallPrompt = SETUP_PROMPT;
   const selectedKeyType = selectedFramework === 'nextjs' ? 'next' : selectedFramework === 'tanstackStart' ? 'vite' : 'raw';
 
   return (
@@ -618,7 +617,11 @@ export default function SetupPage(props: { toMetrics: () => void }) {
       </div>
 
       <div className="flex justify-end mt-8 mx-4">
-        <Tabs value={setupMode} onValueChange={(value) => setSetupMode(value === "manual" ? "manual" : "recommended")}>
+        <Tabs value={setupMode} onValueChange={(value) => {
+          if (value === "manual" || value === "recommended") {
+              setSetupMode(value);
+          }
+        }}>
           <TabsList>
             <TabsTrigger value="recommended">Recommended</TabsTrigger>
             <TabsTrigger value="manual">Manual setup</TabsTrigger>
@@ -635,7 +638,7 @@ export default function SetupPage(props: { toMetrics: () => void }) {
               content: <div className="flex min-w-0 flex-col gap-4">
                 <CodeBlock
                   language="text"
-                  content={selectedInstallPrompt}
+                  content={SETUP_PROMPT}
                   title="Prompt for your AI agent"
                   icon="code"
                   maxHeight={260}
@@ -649,7 +652,7 @@ export default function SetupPage(props: { toMetrics: () => void }) {
                 <Typography>
                   Add these to your project&apos;s <InlineCode>.env.local</InlineCode> file.
                 </Typography>
-                <HexclaveKeys keys={keys} onGenerateKeys={onGenerateKeys} type={selectedKeyType} />
+                <HexclaveKeys keys={keys} onGenerateKeys={onGenerateKeys} type="next" />
               </>,
             },
             {
diff --git a/apps/dashboard/src/components/env-keys.tsx b/apps/dashboard/src/components/env-keys.tsx
index 93fa7dace..13411ebf6 100644
--- a/apps/dashboard/src/components/env-keys.tsx
+++ b/apps/dashboard/src/components/env-keys.tsx
@@ -90,6 +90,7 @@ function getEnvFileContent(props: {
   superSecretAdminKey?: string,
 }) {
   const envFileContent = Object.entries({
+    NEXT_PUBLIC_HEXCLAVE_API_URL: getPublicEnvVar('NEXT_PUBLIC_STACK_API_URL') === "https://api.stack-auth.com" ? undefined : getPublicEnvVar('NEXT_PUBLIC_STACK_API_URL'),
     NEXT_PUBLIC_HEXCLAVE_PROJECT_ID: props.projectId,
     NEXT_PUBLIC_HEXCLAVE_PUBLISHABLE_CLIENT_KEY: props.publishableClientKey,
     HEXCLAVE_SECRET_SERVER_KEY: props.secretServerKey,