diff --git a/backend/apps/agents/agent_manager.py b/backend/apps/agents/agent_manager.py
index 13ca8c5e..1bbefc72 100644
--- a/backend/apps/agents/agent_manager.py
+++ b/backend/apps/agents/agent_manager.py
@@ -1593,7 +1593,7 @@ class AgentManager:
             resp = await client.messages.create(
                 model="claude-sonnet-4-20250514",
                 max_tokens=30,
-                system="Generate a clear 3-5 word title describing what the user wants to do. Examples: 'Summarize Today Emails', 'Debug Login Page', 'Weekly Report Draft'. Never describe errors, outcomes, or system states. No quotes, no punctuation, no emojis. Return only the title.",
+                system="Generate a 2-4 word title for what the user wants. Be terse. No filler words. No quotes, no punctuation. Return only the title.",
                 messages=[{"role": "user", "content": first_prompt}],
             )
             generated = resp.content[0].text.strip().strip('"\'')
@@ -1645,7 +1645,7 @@ class AgentManager:
                 "Generate a concise 2-5 word name and a minimal SVG icon for a group of tool actions.\n\n"
                 "Return ONLY valid JSON: {\"name\": \"...\", \"svg\": \"...\"}\n\n"
                 "Name rules:\n"
-                "- 2-5 words, title case, describes the action (e.g. \"Email Inbox Search\", \"Reading Project Files\")\n\n"
+                "- 2-3 words, title case, terse, no filler words\n\n"
                 "SVG rules:\n"
                 "- 24x24 viewBox\n"
                 "- Use currentColor for all stroke/fill values\n"
diff --git a/backend/apps/tools_lib/tools_lib.py b/backend/apps/tools_lib/tools_lib.py
index 68fa7c09..4a6bfdc7 100644
--- a/backend/apps/tools_lib/tools_lib.py
+++ b/backend/apps/tools_lib/tools_lib.py
@@ -155,6 +155,7 @@ async def oauth_callback(code: str = Query(...), state: str = Query("")):
         tool.oauth_tokens = {
             "access_token": tokens.get("access_token", ""),
         }
+        tool.auth_type = "oauth2"
         tool.auth_status = "connected"
         tool.connected_account_email = tokens.get("workspace_name", "Notion workspace")
     else:
@@ -181,6 +182,7 @@ async def oauth_callback(code: str = Query(...), state: str = Query("")):
             "refresh_token": tokens.get("refresh_token", ""),
             "token_expiry": time.time() + tokens.get("expires_in", 3600),
         }
+        tool.auth_type = "oauth2"
         tool.auth_status = "connected"
 
         if access_token:
@@ -413,7 +415,7 @@ def derive_mcp_config(tool: ToolDefinition) -> Optional[dict]:
             env = config.setdefault("env", {})
             env.update(tool.credentials)
 
-    if tool.auth_type == "oauth2" and tool.oauth_tokens.get("access_token"):
+    if tool.oauth_tokens.get("access_token"):
         if config.get("type") in ("http", "sse"):
             headers = config.setdefault("headers", {})
             headers["Authorization"] = f"Bearer {tool.oauth_tokens['access_token']}"