diff --git a/webui/react-ui/src/components/AgentForm.jsx b/webui/react-ui/src/components/AgentForm.jsx
index 6cd7b84..5d87146 100644
--- a/webui/react-ui/src/components/AgentForm.jsx
+++ b/webui/react-ui/src/components/AgentForm.jsx
@@ -135,7 +135,7 @@ const AgentForm = ({
       ...formData,
       mcp_servers: [
         ...(formData.mcp_servers || []),
-        { url: '' }
+        { url: '', token: '' }
       ]
     });
   };
@@ -151,9 +151,12 @@ const AgentForm = ({
   };
 
   // Handle MCP server change
-  const handleMCPServerChange = (index, value) => {
+  const handleMCPServerChange = (index, field, value) => {
     const updatedMCPServers = [...formData.mcp_servers];
-    updatedMCPServers[index] = { url: value };
+    updatedMCPServers[index] = { 
+      ...updatedMCPServers[index],
+      [field]: value 
+    };
     setFormData({
       ...formData,
       mcp_servers: updatedMCPServers
diff --git a/webui/react-ui/src/components/agent-form-sections/MCPServersSection.jsx b/webui/react-ui/src/components/agent-form-sections/MCPServersSection.jsx
index 72c6929..e76582f 100644
--- a/webui/react-ui/src/components/agent-form-sections/MCPServersSection.jsx
+++ b/webui/react-ui/src/components/agent-form-sections/MCPServersSection.jsx
@@ -47,8 +47,8 @@ const MCPServersSection = ({
               <input 
                 type="password" 
                 id={`mcp-api-key-${index}`}
-                value={server.api_key || ''}
-                onChange={(e) => handleMCPServerChange(index, 'api_key', e.target.value)}
+                value={server.token || ''}
+                onChange={(e) => handleMCPServerChange(index, 'token', e.target.value)}
                 className="form-control"
               />
             </div>