diff --git a/src/lib/api.ts b/src/lib/api.ts
index d4363de..75924e5 100644
--- a/src/lib/api.ts
+++ b/src/lib/api.ts
@@ -174,10 +174,10 @@ export const api = {
     req<SignupResult>('/api/signup', { method: 'POST', body: JSON.stringify(body) }),
 
   login: (email: string, password: string) =>
-    req<{ user_id: number; email: string; api_key_prefix: string }>('/api/login', {
-      method: 'POST',
-      body: JSON.stringify({ email, password }),
-    }),
+    req<{ user_id: number; email: string; api_key: string; mcp_connection: { url: string; header: string } }>(
+      '/api/login',
+      { method: 'POST', body: JSON.stringify({ email, password }) },
+    ),
 
   me: (apiKey: string) =>
     req<MeResult>('/api/me', { headers: authHeader(apiKey) }),
diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx
index 5b46483..9f3dad1 100644
--- a/src/pages/Login.tsx
+++ b/src/pages/Login.tsx
@@ -13,15 +13,8 @@ export default function Login() {
     setError('');
     setLoading(true);
     try {
-      const savedKey = session.getKey();
-      if (!savedKey) {
-        setError('No API key found. Please use your API key directly or re-generate it from a previous signup.');
-        setLoading(false);
-        return;
-      }
-      // Verify credentials via /api/login then confirm key works
-      await api.login(form.email, form.password);
-      session.save(savedKey, form.email);
+      const result = await api.login(form.email, form.password);
+      session.save(result.api_key, result.email);
       navigate('/dashboard');
     } catch (err: unknown) {
       setError(err instanceof Error ? err.message : 'Login failed');