diff --git a/.env.example b/.env.example
index 07d7425..9b0f870 100644
--- a/.env.example
+++ b/.env.example
@@ -4,8 +4,3 @@ KV_REST_API_TOKEN=''
 KV_REST_API_URL=''
 NEXT_PUBLIC_URL='http://localhost:3000'
 NEXTAUTH_URL='http://localhost:3000'
-
-NEXTAUTH_SECRET=""
-NEYNAR_API_KEY=""
-NEYNAR_CLIENT_ID=""
-USE_TUNNEL="false"
diff --git a/bin/init.js b/bin/init.js
index fb6e718..c610a8b 100644
--- a/bin/init.js
+++ b/bin/init.js
@@ -693,6 +693,7 @@ export async function init(projectName = null, autoAcceptDefaults = false, apiKe
       );
     }
     if (answers.seedPhrase) {
+      console.log('✅ Writing SEED_PHRASE and NEXTAUTH_SECRET to .env.local');
       fs.appendFileSync(envPath, `\nSEED_PHRASE="${answers.seedPhrase}"`);
       // Add NextAuth secret for SIWN
       fs.appendFileSync(
diff --git a/package.json b/package.json
index 9748e81..8f97d12 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@neynar/create-farcaster-mini-app",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "type": "module",
   "private": false,
   "access": "public",
diff --git a/src/auth.ts b/src/auth.ts
index e7f2cc3..4976d7a 100644
--- a/src/auth.ts
+++ b/src/auth.ts
@@ -274,7 +274,7 @@ export const authOptions: AuthOptions = {
               ? `https://${process.env.VERCEL_PROJECT_PRODUCTION_URL}`
               : process.env.VERCEL_URL
                 ? `https://${process.env.VERCEL_URL}`
-                : `http://localhost:${process.env.PORT ?? 3000}`;
+                : process.env.NEXTAUTH_URL || `http://localhost:${process.env.PORT ?? 3000}`;
 
           const domain = getDomainFromUrl(baseUrl);
 
@@ -339,26 +339,26 @@ export const authOptions: AuthOptions = {
       name: `next-auth.session-token`,
       options: {
         httpOnly: true,
-        sameSite: 'none',
+        sameSite: process.env.NODE_ENV === 'production' ? 'none' : 'lax',
         path: '/',
-        secure: true,
+        secure: process.env.NODE_ENV === 'production',
       },
     },
     callbackUrl: {
       name: `next-auth.callback-url`,
       options: {
-        sameSite: 'none',
+        sameSite: process.env.NODE_ENV === 'production' ? 'none' : 'lax',
         path: '/',
-        secure: true,
+        secure: process.env.NODE_ENV === 'production',
       },
     },
     csrfToken: {
       name: `next-auth.csrf-token`,
       options: {
         httpOnly: true,
-        sameSite: 'none',
+        sameSite: process.env.NODE_ENV === 'production' ? 'none' : 'lax',
         path: '/',
-        secure: true,
+        secure: process.env.NODE_ENV === 'production',
       },
     },
   },
diff --git a/src/components/ui/NeynarAuthButton/index.tsx b/src/components/ui/NeynarAuthButton/index.tsx
index 33e9a2d..4177a9a 100644
--- a/src/components/ui/NeynarAuthButton/index.tsx
+++ b/src/components/ui/NeynarAuthButton/index.tsx
@@ -569,6 +569,8 @@ export function NeynarAuthButton() {
       } else {
         console.error('❌ Backend sign-in error:', e);
       }
+    } finally {
+      setSignersLoading(false);
     }
   }, [nonce]);