diff --git a/backend/services/llm_client.py b/backend/services/llm_client.py
index 6150890..dc4d124 100644
--- a/backend/services/llm_client.py
+++ b/backend/services/llm_client.py
@@ -784,7 +784,7 @@ class LLMClient:
                 message.model_dump()
                 for message in self._get_anthropic_messages(messages)
             ],
-            max_tokens=max_tokens or 4000,
+            max_tokens=max_tokens or 8000,
             tools=[
                 {
                     "name": "ResponseSchema",
@@ -793,6 +793,7 @@ class LLMClient:
                 },
                 *(tools or []),
             ],
+            tool_choice={"type": "tool", "name": "ResponseSchema"} if not tools else {"type": "any"},
         )
         tool_calls: List[AnthropicToolCall] = []
         for content in response.content:
@@ -1560,7 +1561,7 @@ class LLMClient:
                 message.model_dump()
                 for message in self._get_anthropic_messages(messages)
             ],
-            max_tokens=max_tokens or 4000,
+            max_tokens=max_tokens or 8000,
             tools=[
                 {
                     "name": "ResponseSchema",
@@ -1569,6 +1570,7 @@ class LLMClient:
                 },
                 *(tools or []),
             ],
+            tool_choice={"type": "tool", "name": "ResponseSchema"} if not tools else {"type": "any"},
         ) as stream:
             is_response_schema_tool_call_started = False
             async for event in stream:
diff --git a/frontend/app/login/page.tsx b/frontend/app/login/page.tsx
index 1f3acee..406c282 100644
--- a/frontend/app/login/page.tsx
+++ b/frontend/app/login/page.tsx
@@ -69,6 +69,7 @@ export default function LoginPage() {
       });
 
       if (response.ok) {
+        await dispatch(fetchCurrentUser());
         router.push('/dashboard');
       } else {
         const data = await response.json();