diff --git a/keep-notes/app/(main)/admin/settings/admin-settings-form.tsx b/keep-notes/app/(main)/admin/settings/admin-settings-form.tsx
index d473641..59207dd 100644
--- a/keep-notes/app/(main)/admin/settings/admin-settings-form.tsx
+++ b/keep-notes/app/(main)/admin/settings/admin-settings-form.tsx
@@ -133,7 +133,7 @@ export function AdminSettingsForm({ config }: { config: Record<string, string> }
       if (!tagsProv) throw new Error(t('admin.ai.providerTagsRequired'))
       data.AI_PROVIDER_TAGS = tagsProv
 
-      const tagsModel = formData.get('AI_MODEL_TAGS') as string
+      const tagsModel = formData.get(`AI_MODEL_TAGS_${tagsProv.toUpperCase()}`) as string
       if (tagsModel) data.AI_MODEL_TAGS = tagsModel
 
       if (tagsProv === 'ollama') {
@@ -153,7 +153,7 @@ export function AdminSettingsForm({ config }: { config: Record<string, string> }
       if (!embedProv) throw new Error(t('admin.ai.providerEmbeddingRequired'))
       data.AI_PROVIDER_EMBEDDING = embedProv
 
-      const embedModel = formData.get('AI_MODEL_EMBEDDING') as string
+      const embedModel = formData.get(`AI_MODEL_EMBEDDING_${embedProv.toUpperCase()}`) as string
       if (embedModel) data.AI_MODEL_EMBEDDING = embedModel
 
       if (embedProv === 'ollama') {
@@ -179,6 +179,8 @@ export function AdminSettingsForm({ config }: { config: Record<string, string> }
         toast.success(t('admin.ai.updateSuccess'))
         setTagsProvider(tagsProv)
         setEmbeddingsProvider(embedProv)
+        if (tagsModel) setSelectedTagsModel(tagsModel)
+        if (embedModel) setSelectedEmbeddingModel(embedModel)
 
         // Refresh models after save if Ollama is selected
         if (tagsProv === 'ollama') {