diff --git a/frontend/src/pages/BotProfilePage.vue b/frontend/src/pages/BotProfilePage.vue
index c2b9100..b0fedcd 100644
--- a/frontend/src/pages/BotProfilePage.vue
+++ b/frontend/src/pages/BotProfilePage.vue
@@ -850,8 +850,8 @@ const tierClass = (t: number) => `tier-${t}`
                   <div class="p-2.5 border border-neon-green/30 bg-neon-green/5">
                     <p class="font-display font-bold text-[10px] tracking-wider text-neon-green mb-2">NEW SECRET GENERATED</p>
                     <div class="font-mono text-[10px] text-text-muted space-y-1">
-                      <div>BOT_ID=<span class="text-neon-cyan select-all">{{ regeneratedBotId }}</span></div>
-                      <div>BOT_SECRET=<span class="text-neon-cyan select-all">{{ regeneratedSecret }}</span></div>
+                      <div>BOT_ID=<span class="text-neon-cyan select-all break-all">{{ regeneratedBotId }}</span></div>
+                      <div>BOT_SECRET=<span class="text-neon-cyan select-all break-all">{{ regeneratedSecret }}</span></div>
                     </div>
                     <p class="font-mono text-[9px] text-ko mt-2">Save this now. It will not be shown again after you leave this page.</p>
                   </div>
diff --git a/frontend/src/pages/JoinBoutPage.vue b/frontend/src/pages/JoinBoutPage.vue
index 0d0d19e..7f5a39c 100644
--- a/frontend/src/pages/JoinBoutPage.vue
+++ b/frontend/src/pages/JoinBoutPage.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, onMounted, onUnmounted } from 'vue'
+import { ref, watch, onMounted, onUnmounted } from 'vue'
 import { useRouter, onBeforeRouteLeave } from 'vue-router'
 import { useNostr } from '../composables/useNostr'
 import { useWallet } from '../composables/useWallet'
@@ -10,7 +10,7 @@ import WalletConnect from '../components/WalletConnect.vue'
 import { authFetch } from '../lib/nostr-auth'
 
 const router = useRouter()
-const { pubkey, bot, profilePicUrl, isLoggedIn, hasExtension, hasStoredKey, isLoading, login, waitForSigner, generateLogin, loginWithNsec, registerBot, registerHuman, getStoredNsec, persistKey, logout, initiateNip55Login, processNip55Return, hasAndroidSigner } = useNostr()
+const { pubkey, bot, profilePicUrl, isLoggedIn, hasExtension, hasStoredKey, isLoading, login, waitForSigner, generateLogin, loginWithNsec, registerBot, registerHuman, updateWebhook, getStoredNsec, persistKey, logout, initiateNip55Login, processNip55Return, hasAndroidSigner } = useNostr()
 const showNsecBackup = ref(false)
 const generatedNsec = ref('')
 const generatedNsecHex = ref('')
@@ -388,20 +388,16 @@ async function confirmName() {
   error.value = ''
   isCheckingName.value = true
   try {
-    const res = await fetch(`/api/auth/check-name/${encodeURIComponent(name)}`)
-    if (res.ok) {
-      const data = await res.json()
-      if (!data.available) {
-        error.value = 'That name is taken. Pick another.'
-        return
-      }
-    }
-  } catch {
-    // If check fails, proceed anyway — server will catch it at registration
+    // Register the bot immediately (poll mode default — webhook updated later)
+    const result = await registerBot(name, '', selectedArchetype.value)
+    botId.value = result.bot.id
+    botSecret.value = result.secret
+    step.value = 'bot-setup'
+  } catch (e) {
+    handleError(e, 'Registration failed.')
   } finally {
     isCheckingName.value = false
   }
-  step.value = 'bot-setup'
 }
 
 const isChoosingMode = ref(false)
@@ -504,9 +500,7 @@ async function confirmWebhook() {
   error.value = ''
   isVerifyingWebhook.value = true
   try {
-    const result = await registerBot(botName.value.trim(), url, selectedArchetype.value)
-    botId.value = result.bot.id
-    botSecret.value = result.secret
+    await updateWebhook(url)
     step.value = 'ready'
   } catch (e) {
     handleError(e, 'Webhook verification failed. Check your URL and try again.')
@@ -515,22 +509,15 @@ async function confirmWebhook() {
   }
 }
 
-async function confirmPolling() {
-  error.value = ''
-  try {
-    const result = await registerBot(botName.value.trim(), '', selectedArchetype.value)
-    botId.value = result.bot.id
-    botSecret.value = result.secret
-    step.value = 'ready'
-  } catch (e) {
-    handleError(e, 'Registration failed.')
-  }
+function confirmPolling() {
+  step.value = 'ready'
 }
 
 const showSetupContent = ref(false)
 const setupContent = ref('')
 const setupContentLoading = ref(false)
 const setupContentCopied = ref(false)
+watch(connectionMode, () => { setupContent.value = ''; showSetupContent.value = false })
 
 function setupDocPath() {
   return connectionMode.value === 'polling' ? '/docs/BOTFIGHTS-POLLING.md' : '/docs/BOTFIGHTS-WEBHOOK.md'
@@ -1009,35 +996,58 @@ function handleSignOut() {
           </button>
         </div>
 
-        <!-- Safety callout -->
-        <div class="p-2.5 border border-neon-cyan/20 bg-neon-cyan/5 mb-4">
-          <p class="font-display font-bold text-[10px] tracking-wider text-neon-cyan mb-1">
-            SAFE & SIMPLE
+        <!-- Credentials + setup guide -->
+        <div v-if="botSecret" class="mb-4 p-3 border border-neon-cyan/20 bg-neon-cyan/5">
+          <p class="font-display font-bold text-[10px] tracking-wider text-neon-cyan mb-2">
+            COPY THIS TO YOUR AI
           </p>
-          <ul class="font-mono text-[10px] text-text-muted space-y-0.5 leading-relaxed">
-            <li v-if="connectionMode === 'webhook'">
-              We only send <span class="text-text-secondary">POST</span> requests with fight questions
-            </li>
-            <li v-if="connectionMode === 'polling'">
-              <span class="text-text-secondary">No incoming connections</span> — outbound only
-            </li>
-            <li>Your <span class="text-text-secondary">API keys stay on your machine</span></li>
-            <li>Private IPs <span class="text-text-secondary">blocked</span>, payloads <span class="text-text-secondary">&lt;2KB</span></li>
-          </ul>
-        </div>
 
-        <!-- What's happening -->
-        <details class="mb-4 group">
-          <summary class="font-display font-bold text-[10px] tracking-wider text-text-secondary cursor-pointer
-                         hover:text-neon-purple transition-colors select-none">
-            WHAT'S ACTUALLY HAPPENING?
-          </summary>
-          <p class="mt-2 font-mono text-[10px] text-text-muted leading-relaxed">
-            Your AI runs a small server that receives fight challenges from BOTFIGHTS.
-            When a challenge comes in, it uses Claude to figure out the answer and fires it back.
-            5-10 rounds per fight, scored on correctness and speed.
+          <div class="bg-bg border border-border p-2.5 font-mono text-[10px] text-text-muted leading-relaxed select-all mb-2">
+            <div>BOT_ID=<span class="text-neon-cyan break-all">{{ botId }}</span></div>
+            <div>BOT_SECRET=<span class="text-neon-cyan break-all">{{ botSecret }}</span></div>
+          </div>
+
+          <button
+            class="w-full py-2 border border-border text-[10px] font-display font-bold tracking-wider
+                   hover:border-neon-cyan/40 hover:text-neon-cyan transition-all"
+            :class="setupGuideCopied ? 'text-neon-green border-neon-green/40' : 'text-text-muted'"
+            @click="copyFullPrompt"
+          >
+            {{ setupGuideCopied ? 'COPIED' : 'COPY GUIDE + CREDENTIALS' }}
+          </button>
+
+          <p class="font-mono text-[9px] text-text-muted/60 leading-relaxed mt-2">
+            Paste into your AI — includes full setup guide with your credentials.
           </p>
-        </details>
+
+          <!-- Collapsible guide preview -->
+          <button
+            class="w-full mt-2 py-1.5 border border-border text-[9px] font-display font-bold tracking-wider
+                   text-text-muted hover:border-neon-cyan/40 hover:text-neon-cyan transition-all"
+            @click="toggleSetupContent"
+          >
+            {{ showSetupContent ? 'HIDE' : 'VIEW' }} SETUP GUIDE
+          </button>
+          <div v-if="showSetupContent" class="mt-2 border border-border bg-black/40 overflow-hidden">
+            <div class="flex items-center justify-between px-3 py-2 border-b border-border/50 bg-surface-raised/30">
+              <span class="font-display font-bold text-[9px] tracking-wider text-text-muted">{{ setupDocName() }}</span>
+              <button
+                class="font-display font-bold text-[9px] tracking-wider px-2 py-0.5 border transition-all"
+                :class="setupContentCopied
+                  ? 'border-neon-green/40 text-neon-green'
+                  : 'border-border text-text-muted hover:border-neon-cyan/40 hover:text-neon-cyan'"
+                @click="copySetupContent"
+              >
+                {{ setupContentCopied ? 'COPIED' : 'COPY ALL' }}
+              </button>
+            </div>
+            <div v-if="setupContentLoading" class="p-4 text-center">
+              <p class="font-mono text-[10px] text-text-muted animate-pulse">Loading...</p>
+            </div>
+            <pre v-else class="p-3 font-mono text-[10px] text-text-secondary leading-relaxed
+                               overflow-x-auto max-h-80 overflow-y-auto whitespace-pre-wrap break-words select-all">{{ setupContent }}</pre>
+          </div>
+        </div>
 
         <div class="flex gap-2">
           <button