diff --git a/web/frontend/src/components/config/config-page.tsx b/web/frontend/src/components/config/config-page.tsx
index 15d7e1bc1..e5c1f736c 100644
--- a/web/frontend/src/components/config/config-page.tsx
+++ b/web/frontend/src/components/config/config-page.tsx
@@ -152,11 +152,13 @@ export function ConfigPage() {
       id: `mcp-${Date.now()}-${nextIndex}`,
       name: "",
       enabled: true,
+      deferredOverride: null,
       type: "stdio",
       url: "",
       command: "",
       argsText: "",
       envText: "{}",
+      envFile: "",
       headersText: "{}",
     }
     updateField("mcpServers", [...form.mcpServers, server])
@@ -264,16 +266,20 @@ export function ConfigPage() {
           "Cron exec timeout",
           { min: 0 },
         )
-        const mcpDiscoveryTTL = parseIntField(
-          form.mcpDiscoveryTTL,
-          "MCP discovery ttl",
-          { min: 0 },
-        )
-        const mcpDiscoveryMaxSearchResults = parseIntField(
-          form.mcpDiscoveryMaxSearchResults,
-          "MCP discovery max search results",
-          { min: 0 },
-        )
+        const mcpDiscoveryValidationEnabled =
+          form.mcpEnabled && form.mcpDiscoveryEnabled
+        const mcpDiscoveryTTL = mcpDiscoveryValidationEnabled
+          ? parseIntField(form.mcpDiscoveryTTL, "MCP discovery ttl", {
+              min: 0,
+            })
+          : Number.parseInt(EMPTY_FORM.mcpDiscoveryTTL, 10)
+        const mcpDiscoveryMaxSearchResults = mcpDiscoveryValidationEnabled
+          ? parseIntField(
+              form.mcpDiscoveryMaxSearchResults,
+              "MCP discovery max search results",
+              { min: 0 },
+            )
+          : Number.parseInt(EMPTY_FORM.mcpDiscoveryMaxSearchResults, 10)
         const execConfigPatch: Record<string, unknown> = {
           enabled: form.execEnabled,
         }
@@ -290,6 +296,7 @@ export function ConfigPage() {
             name: server.name.trim(),
             url: server.url.trim(),
             command: server.command.trim(),
+            envFile: server.envFile.trim(),
           }))
           .filter((server) => server.name !== "")
 
@@ -321,6 +328,11 @@ export function ConfigPage() {
           .map((name) => [name, null] as const)
 
         const upsertServerEntries = normalizedServers.map((server) => {
+          const deferredPatch =
+            server.deferredOverride === null
+              ? {}
+              : { deferred: server.deferredOverride }
+
           if (server.type !== "stdio") {
             if (server.url === "") {
               throw new Error(`MCP server ${server.name} requires a URL.`)
@@ -329,6 +341,7 @@ export function ConfigPage() {
             return [
               server.name,
               {
+                ...deferredPatch,
                 enabled: server.enabled,
                 type: server.type,
                 url: server.url,
@@ -351,6 +364,7 @@ export function ConfigPage() {
           return [
             server.name,
             {
+              ...deferredPatch,
               enabled: server.enabled,
               type: "stdio",
               command: server.command,
@@ -359,9 +373,9 @@ export function ConfigPage() {
                 server.envText,
                 `MCP server ${server.name} env`,
               ),
+              env_file: server.envFile === "" ? null : server.envFile,
               url: null,
               headers: null,
-              env_file: null,
             },
           ] as const
         })
diff --git a/web/frontend/src/components/config/config-sections.tsx b/web/frontend/src/components/config/config-sections.tsx
index f5e4f618a..2d3237105 100644
--- a/web/frontend/src/components/config/config-sections.tsx
+++ b/web/frontend/src/components/config/config-sections.tsx
@@ -401,7 +401,7 @@ export function MCPSection({
                     />
                   </div>
 
-                  {server.type === "http" ? (
+                  {server.type !== "stdio" ? (
                     <div className="mt-3 grid gap-3">
                       <Input
                         value={server.url}
diff --git a/web/frontend/src/components/config/form-model.ts b/web/frontend/src/components/config/form-model.ts
index 55ba16e9a..62fcf103b 100644
--- a/web/frontend/src/components/config/form-model.ts
+++ b/web/frontend/src/components/config/form-model.ts
@@ -40,11 +40,13 @@ export interface MCPServerForm {
   id: string
   name: string
   enabled: boolean
+  deferredOverride: boolean | null
   type: MCPServerType
   url: string
   command: string
   argsText: string
   envText: string
+  envFile: string
   headersText: string
 }
 
@@ -144,6 +146,10 @@ function asBool(value: unknown): boolean {
   return value === true
 }
 
+function asOptionalBool(value: unknown): boolean | null {
+  return typeof value === "boolean" ? value : null
+}
+
 function asNumberString(value: unknown, fallback: string): string {
   if (typeof value === "number" && Number.isFinite(value)) {
     return String(value)
@@ -193,11 +199,13 @@ function mapMCPServers(value: unknown): MCPServerForm[] {
       id: makeMCPServerID(name),
       name,
       enabled: cfg.enabled !== false,
+      deferredOverride: asOptionalBool(cfg.deferred),
       type,
       url,
       command: asString(cfg.command),
       argsText: argsList.join("\n"),
       envText: JSON.stringify(env, null, 2),
+      envFile: asString(cfg.env_file),
       headersText: JSON.stringify(headers, null, 2),
     }
   })