diff --git a/chat/public/admin.html b/chat/public/admin.html
index 0a98f97..b41211b 100644
--- a/chat/public/admin.html
+++ b/chat/public/admin.html
@@ -120,10 +120,6 @@
         </header>
         <p style="margin-top:0; color: var(--muted);">These models are displayed to users in the builder dropdown for selection. This is separate from the OpenCode fallback chain.</p>
         <form id="public-model-form" class="admin-form">
-          <label>
-            Model ID (e.g., claude-3-5-sonnet, gpt-4o)
-            <input id="public-model-name" type="text" placeholder="Enter model ID manually" required />
-          </label>
           <label>
             Display name shown to users
             <input id="public-model-label" type="text" placeholder="Friendly label (e.g., Claude 3.5 Sonnet)" required />
diff --git a/chat/public/admin.js b/chat/public/admin.js
index 71d0115..c1dcb22 100644
--- a/chat/public/admin.js
+++ b/chat/public/admin.js
@@ -34,7 +34,6 @@
     opencodeModelsCount: document.getElementById('opencode-models-count'),
     // Public Models (user-facing selection)
     publicModelForm: document.getElementById('public-model-form'),
-    publicModelName: document.getElementById('public-model-name'),
     publicModelLabel: document.getElementById('public-model-label'),
     publicModelTier: document.getElementById('public-model-tier'),
     publicModelIcon: document.getElementById('public-model-icon'),
@@ -2425,16 +2424,11 @@
   if (el.publicModelForm) {
     el.publicModelForm.addEventListener('submit', async (e) => {
       e.preventDefault();
-      const name = el.publicModelName.value.trim();
       const label = el.publicModelLabel.value.trim();
       const icon = el.publicModelIcon ? el.publicModelIcon.value : '';
       const tier = el.publicModelTier ? el.publicModelTier.value : 'free';
       const supportsMedia = el.publicModelMedia ? el.publicModelMedia.checked : false;
       
-      if (!name) {
-        setPublicModelStatus('Model ID is required.', true);
-        return;
-      }
       if (!label) {
         setPublicModelStatus('Display name is required.', true);
         return;
@@ -2446,7 +2440,6 @@
           method: 'POST',
           body: JSON.stringify({ 
             type: 'public',
-            name, 
             label, 
             icon, 
             tier, 
@@ -2454,7 +2447,6 @@
           }),
         });
         setPublicModelStatus('Saved');
-        el.publicModelName.value = '';
         el.publicModelLabel.value = '';
         await loadConfigured();
       } catch (err) {
diff --git a/chat/server.js b/chat/server.js
index 0e62dfa..33c8992 100644
--- a/chat/server.js
+++ b/chat/server.js
@@ -15861,11 +15861,15 @@ async function handleAdminModelUpsert(req, res) {
   if (!session) return;
   try {
     const body = await parseJsonBody(req);
+    const isPublic = body.type === 'public';
+    const isOpencode = body.type === 'opencode';
     const modelName = (body.name || body.model || '').trim();
     const label = (body.label || body.displayName || modelName).trim();
     const tier = normalizeTier(body.tier);
     
-    if (!modelName) return sendJson(res, 400, { error: 'Model name is required' });
+    // For public models, label is required; for opencode, name is required
+    if (isOpencode && !modelName) return sendJson(res, 400, { error: 'Model name is required' });
+    if (isPublic && !label) return sendJson(res, 400, { error: 'Display name is required' });
     
     let icon = '';
     if (typeof body.icon === 'string' && body.icon.trim()) {
@@ -15873,9 +15877,11 @@ async function handleAdminModelUpsert(req, res) {
     }
     const supportsMedia = typeof body.supportsMedia === 'boolean' ? body.supportsMedia : false;
     
+    // For public models, use label as the display identifier (no model ID needed)
+    // For opencode models, use the actual model name
     const payload = { 
       id: body.id || randomUUID(), 
-      name: modelName, 
+      name: isPublic ? label : modelName, 
       label: label || modelName, 
       icon, 
       tier,