diff --git a/src/components/AgentRegister.tsx b/src/components/AgentRegister.tsx
index eacaadba..835773c3 100644
--- a/src/components/AgentRegister.tsx
+++ b/src/components/AgentRegister.tsx
@@ -18,7 +18,8 @@ const LLM_MODELS = [
   "Cursor Composer", "xAI Grok", "Moonshot Kimi", "DeepSeek", "Qwen", "Others",
 ] as const;
 
-type WizardStep = 1 | 2 | "3a" | "3b" | "3c" | "done";
+type WizardStep = 1 | 2 | "done";
+type BindStep = "enter" | "sign" | "submit" | "bound" | null;
 
 const EIP712_DOMAIN = {
   name: "ERC8004IdentityRegistry",
@@ -56,6 +57,7 @@ export function AgentRegister() {
   const [signing, setSigning] = useState(false);
   const [binding, setBinding] = useState(false);
   const [bindTxHash, setBindTxHash] = useState<Hex | undefined>();
+  const [bindStep, setBindStep] = useState<BindStep>(null);
   const [error, setError] = useState<string | null>(null);
 
   const agentURI = useMemo(() => {
@@ -122,7 +124,7 @@ export function AgentRegister() {
       } catch {
         setError("On-chain OK, but cache failed — will sync on next visit");
       }
-      setStep("3a");
+      setStep("done");
     } catch (err) {
       setError(err instanceof Error ? err.message : "Registration failed");
     } finally {
@@ -144,7 +146,7 @@ export function AgentRegister() {
       });
       setAgentSignature(signature);
       setSignatureDeadline(deadline);
-      setStep("3c");
+      setBindStep("submit");
     } catch (err) {
       setError(err instanceof Error ? err.message : "Agent wallet signing failed");
     } finally {
@@ -174,7 +176,7 @@ export function AgentRegister() {
           fields: { agent_wallet: agentWallet.toLowerCase() },
         }),
       }).catch(() => {});
-      setStep("done");
+      setBindStep("bound");
     } catch (err) {
       setError(err instanceof Error ? err.message : "Wallet binding failed");
     } finally {
@@ -187,13 +189,13 @@ export function AgentRegister() {
   const isOwnerWalletConnected =
     ownerAddress && address?.toLowerCase() === ownerAddress.toLowerCase();
 
-  const stepNum = typeof step === "number" ? step : step === "done" ? 4 : 3;
+  const stepNum = typeof step === "number" ? step : 3;
 
   return (
     <div className="mt-6">
       {/* Step indicator */}
       <div className="flex items-center gap-2">
-        {([1, 2, 3] as const).map((s) => (
+        {([1, 2] as const).map((s) => (
           <div key={s} className="flex items-center gap-2">
             <div className={`flex h-7 w-7 items-center justify-center rounded-full border text-xs font-medium transition-colors ${
               s === stepNum ? "border-accent text-accent"
@@ -202,13 +204,12 @@ export function AgentRegister() {
             }`}>
               {s < stepNum ? "\u2713" : s}
             </div>
-            {s < 3 && <div className={`h-px w-8 ${s < stepNum ? "bg-accent" : "bg-border"}`} />}
+            {s < 2 && <div className={`h-px w-8 ${s < stepNum ? "bg-accent" : "bg-border"}`} />}
           </div>
         ))}
         <span className="text-muted ml-3 text-xs">
           {step === 1 && "Agent Profile"}
           {step === 2 && "On-chain Registration"}
-          {(step === "3a" || step === "3b" || step === "3c") && "Bind Wallet"}
           {step === "done" && "Complete"}
         </span>
       </div>
@@ -280,101 +281,106 @@ export function AgentRegister() {
         </div>
       )}
 
-      {/* Step 3a: Enter agent wallet */}
-      {step === "3a" && (
-        <div className="mt-6 space-y-5">
-          {agentId !== undefined && (
-            <div className="border-accent/30 bg-accent/5 rounded border px-4 py-3">
-              <p className="text-accent text-sm font-medium">Agent registered successfully</p>
-              <p className="text-muted mt-1 text-xs">Agent ID: <code className="text-foreground">{agentId.toString()}</code></p>
-            </div>
-          )}
-          <p className="text-muted text-xs leading-relaxed">
-            Bind a separate wallet to your agent. The agent wallet must sign an EIP-712 message to prove consent.
-          </p>
-          <div>
-            <label className="text-foreground mb-2 block text-sm">Agent Wallet Address</label>
-            <input type="text" value={agentWallet} onChange={(e) => setAgentWallet(e.target.value)} placeholder="0x..."
-              className="border-border bg-surface text-foreground placeholder:text-muted w-full rounded border px-3 py-2 text-sm font-mono focus:border-accent focus:outline-none" />
-          </div>
-          <div className="flex gap-3">
-            <button onClick={() => setStep("done")} className="border-border text-muted hover:text-foreground rounded border px-4 py-2.5 text-sm transition-colors">Skip</button>
-            <button onClick={() => { setError(null); setStep("3b"); }}
-              disabled={!agentWallet.match(/^0x[a-fA-F0-9]{40}$/) || agentWallet.toLowerCase() === ownerAddress?.toLowerCase()}
-              className="border-accent text-accent hover:bg-accent hover:text-background flex-1 rounded border py-2.5 text-sm font-medium transition-colors disabled:opacity-50">
-              Continue
-            </button>
-          </div>
-        </div>
-      )}
-
-      {/* Step 3b: Sign with agent wallet */}
-      {step === "3b" && (
-        <div className="mt-6 space-y-5">
-          <div className="border-border bg-surface rounded border px-4 py-3 space-y-2">
-            <p className="text-foreground text-sm font-medium">Switch to the agent wallet</p>
-            <p className="text-accent text-xs font-mono break-all">{agentWallet}</p>
-          </div>
-          <div className="flex items-center gap-2">
-            <div className={`h-2 w-2 rounded-full ${isAgentWalletConnected ? "bg-accent" : "bg-border"}`} />
-            <span className="text-muted text-xs">
-              {isAgentWalletConnected ? <span className="text-accent">Agent wallet connected. Ready to sign.</span>
-                : <>Currently: <code className="text-foreground font-mono">{address?.slice(0, 6)}...{address?.slice(-4)}</code></>}
-            </span>
-          </div>
-          <div className="flex gap-3">
-            <button onClick={() => { setError(null); setStep("3a"); }} disabled={signing}
-              className="border-border text-muted hover:text-foreground rounded border px-4 py-2.5 text-sm transition-colors disabled:opacity-50">Back</button>
-            <button onClick={handleAgentSign} disabled={signing || !isAgentWalletConnected}
-              className="border-accent text-accent hover:bg-accent hover:text-background flex-1 rounded border py-2.5 text-sm font-medium transition-colors disabled:opacity-50">
-              {signing ? "Signing..." : "Sign with Agent Wallet"}
-            </button>
-          </div>
-        </div>
-      )}
-
-      {/* Step 3c: Submit as owner */}
-      {step === "3c" && (
-        <div className="mt-6 space-y-5">
-          <div className="border-accent/30 bg-accent/5 rounded border px-4 py-3">
-            <p className="text-accent text-sm font-medium">Agent wallet signature obtained</p>
-          </div>
-          <div className="border-border bg-surface rounded border px-4 py-3 space-y-2">
-            <p className="text-foreground text-sm font-medium">Switch back to the owner wallet</p>
-            <p className="text-accent text-xs font-mono break-all">{ownerAddress}</p>
-          </div>
-          <div className="flex items-center gap-2">
-            <div className={`h-2 w-2 rounded-full ${isOwnerWalletConnected ? "bg-accent" : "bg-border"}`} />
-            <span className="text-muted text-xs">
-              {isOwnerWalletConnected ? <span className="text-accent">Owner wallet connected. Ready to submit.</span>
-                : <>Currently: <code className="text-foreground font-mono">{address?.slice(0, 6)}...{address?.slice(-4)}</code></>}
-            </span>
-          </div>
-          {bindTxHash && (
-            <div className="border-border text-muted rounded border px-3 py-2 text-xs">
-              Tx: <a href={`${EXPLORER_URL}/tx/${bindTxHash}`} target="_blank" rel="noopener noreferrer" className="text-accent hover:underline">
-                {bindTxHash.slice(0, 10)}...{bindTxHash.slice(-8)}
-              </a>
-            </div>
-          )}
-          <div className="flex gap-3">
-            <button onClick={() => setStep("done")} disabled={binding}
-              className="border-border text-muted hover:text-foreground rounded border px-4 py-2.5 text-sm transition-colors disabled:opacity-50">Skip</button>
-            <button onClick={handleSubmitBinding} disabled={binding || !isOwnerWalletConnected}
-              className="border-accent text-accent hover:bg-accent hover:text-background flex-1 rounded border py-2.5 text-sm font-medium transition-colors disabled:opacity-50">
-              {binding ? "Binding wallet..." : "Submit Binding Transaction"}
-            </button>
-          </div>
-        </div>
-      )}
-
       {/* Done */}
       {step === "done" && (
-        <div className="mt-6 text-center py-8">
-          <div className="border-accent/30 bg-accent/5 rounded border px-4 py-4 inline-block">
+        <div className="mt-6 space-y-6 py-8">
+          <div className="border-accent/30 bg-accent/5 rounded border px-4 py-4 text-center">
             <p className="text-accent text-sm font-medium">Agent registration complete</p>
             {agentId !== undefined && <p className="text-muted mt-1 text-xs">Agent ID: {agentId.toString()}</p>}
           </div>
+          {agentId !== undefined && (
+            <details className="border-border rounded border" open={bindStep !== null}>
+              <summary className="text-muted cursor-pointer px-4 py-3 text-xs hover:text-foreground transition-colors"
+                onClick={() => { if (!bindStep) setBindStep("enter"); }}>
+                Optional — Want to use a different wallet for your agent?
+              </summary>
+              <div className="border-t border-border px-4 py-3 space-y-4">
+                <p className="text-muted text-xs leading-relaxed">
+                  By default, your connected wallet is used as the agent wallet. You can bind a separate wallet for CLI/bot usage.
+                </p>
+
+                {/* Enter address */}
+                {bindStep === "enter" && (
+                  <div className="space-y-3">
+                    <div>
+                      <label className="text-foreground mb-2 block text-sm">Agent Wallet Address</label>
+                      <input type="text" value={agentWallet} onChange={(e) => setAgentWallet(e.target.value)} placeholder="0x..."
+                        className="border-border bg-surface text-foreground placeholder:text-muted w-full rounded border px-3 py-2 text-sm font-mono focus:border-accent focus:outline-none" />
+                    </div>
+                    <button onClick={() => { setError(null); setBindStep("sign"); }}
+                      disabled={!agentWallet.match(/^0x[a-fA-F0-9]{40}$/)}
+                      className="border-accent text-accent hover:bg-accent hover:text-background w-full rounded border py-2 text-xs font-medium transition-colors disabled:opacity-50">
+                      Continue
+                    </button>
+                  </div>
+                )}
+
+                {/* Sign with agent wallet */}
+                {bindStep === "sign" && (
+                  <div className="space-y-3">
+                    <div className="border-border bg-surface rounded border px-4 py-3 space-y-2">
+                      <p className="text-foreground text-sm font-medium">Switch to the agent wallet</p>
+                      <p className="text-accent text-xs font-mono break-all">{agentWallet}</p>
+                    </div>
+                    <div className="flex items-center gap-2">
+                      <div className={`h-2 w-2 rounded-full ${isAgentWalletConnected ? "bg-accent" : "bg-border"}`} />
+                      <span className="text-muted text-xs">
+                        {isAgentWalletConnected ? <span className="text-accent">Agent wallet connected. Ready to sign.</span>
+                          : <>Currently: <code className="text-foreground font-mono">{address?.slice(0, 6)}...{address?.slice(-4)}</code></>}
+                      </span>
+                    </div>
+                    <div className="flex gap-3">
+                      <button onClick={() => { setError(null); setBindStep("enter"); }} disabled={signing}
+                        className="border-border text-muted hover:text-foreground rounded border px-4 py-2 text-xs transition-colors disabled:opacity-50">Back</button>
+                      <button onClick={handleAgentSign} disabled={signing || !isAgentWalletConnected}
+                        className="border-accent text-accent hover:bg-accent hover:text-background flex-1 rounded border py-2 text-xs font-medium transition-colors disabled:opacity-50">
+                        {signing ? "Signing..." : "Sign with Agent Wallet"}
+                      </button>
+                    </div>
+                  </div>
+                )}
+
+                {/* Submit binding as owner */}
+                {bindStep === "submit" && (
+                  <div className="space-y-3">
+                    <div className="border-accent/30 bg-accent/5 rounded border px-4 py-3">
+                      <p className="text-accent text-sm font-medium">Agent wallet signature obtained</p>
+                    </div>
+                    <div className="border-border bg-surface rounded border px-4 py-3 space-y-2">
+                      <p className="text-foreground text-sm font-medium">Switch back to the owner wallet</p>
+                      <p className="text-accent text-xs font-mono break-all">{ownerAddress}</p>
+                    </div>
+                    <div className="flex items-center gap-2">
+                      <div className={`h-2 w-2 rounded-full ${isOwnerWalletConnected ? "bg-accent" : "bg-border"}`} />
+                      <span className="text-muted text-xs">
+                        {isOwnerWalletConnected ? <span className="text-accent">Owner wallet connected. Ready to submit.</span>
+                          : <>Currently: <code className="text-foreground font-mono">{address?.slice(0, 6)}...{address?.slice(-4)}</code></>}
+                      </span>
+                    </div>
+                    {bindTxHash && (
+                      <div className="border-border text-muted rounded border px-3 py-2 text-xs">
+                        Tx: <a href={`${EXPLORER_URL}/tx/${bindTxHash}`} target="_blank" rel="noopener noreferrer" className="text-accent hover:underline">
+                          {bindTxHash.slice(0, 10)}...{bindTxHash.slice(-8)}
+                        </a>
+                      </div>
+                    )}
+                    <button onClick={handleSubmitBinding} disabled={binding || !isOwnerWalletConnected}
+                      className="border-accent text-accent hover:bg-accent hover:text-background w-full rounded border py-2 text-xs font-medium transition-colors disabled:opacity-50">
+                      {binding ? "Binding wallet..." : "Submit Binding Transaction"}
+                    </button>
+                  </div>
+                )}
+
+                {/* Binding complete */}
+                {bindStep === "bound" && (
+                  <div className="border-accent/30 bg-accent/5 rounded border px-4 py-3">
+                    <p className="text-accent text-sm font-medium">Agent wallet bound successfully</p>
+                    <p className="text-muted mt-1 text-xs font-mono break-all">{agentWallet}</p>
+                  </div>
+                )}
+              </div>
+            </details>
+          )}
         </div>
       )}
     </div>