diff --git a/src/composables/useSetupWizard.ts b/src/composables/useSetupWizard.ts
index c035b956..62e73481 100644
--- a/src/composables/useSetupWizard.ts
+++ b/src/composables/useSetupWizard.ts
@@ -62,8 +62,8 @@ export interface WizardData {
     apiKey: string
     baseUrl: string
     baseUrlPreset: string
-    userAgent: string
     maxContextTokens: number
+    userAgent: string
     audioInputProvider: string
     audioInputApiKey: string
     audioInputBaseUrl: string
@@ -249,8 +249,8 @@ const wizardData = ref<WizardData>({
     apiKey: '',
     baseUrl: 'https://api.deepseek.com',
     baseUrlPreset: '',
-    userAgent: '',
     maxContextTokens: 64,
+    userAgent: '',
     audioInputProvider: 'openai',
     audioInputApiKey: '',
     audioInputBaseUrl: '',
@@ -1447,8 +1447,8 @@ export function useSetupWizard() {
         LLM_API_KEY: wizardData.value.agent.apiKey,
         LLM_BASE_URL: wizardData.value.agent.baseUrl || null,
         LLM_BASE_URL_PRESET: wizardData.value.agent.baseUrlPreset || null,
-        LLM_USER_AGENT: wizardData.value.agent.userAgent || null,
         LLM_MAX_CONTEXT_TOKENS: wizardData.value.agent.maxContextTokens,
+        LLM_USER_AGENT: wizardData.value.agent.userAgent || null,
         AUDIO_INPUT_PROVIDER: wizardData.value.agent.audioInputProvider || 'openai',
         AUDIO_INPUT_API_KEY: wizardData.value.agent.audioInputApiKey || null,
         AUDIO_INPUT_BASE_URL: wizardData.value.agent.audioInputBaseUrl || null,
@@ -1561,8 +1561,8 @@ export function useSetupWizard() {
         wizardData.value.agent.apiKey = result.data.LLM_API_KEY || ''
         wizardData.value.agent.baseUrl = result.data.LLM_BASE_URL || ''
         wizardData.value.agent.baseUrlPreset = result.data.LLM_BASE_URL_PRESET || ''
-        wizardData.value.agent.userAgent = result.data.LLM_USER_AGENT || ''
         wizardData.value.agent.maxContextTokens = result.data.LLM_MAX_CONTEXT_TOKENS || 64
+        wizardData.value.agent.userAgent = result.data.LLM_USER_AGENT || ''
         wizardData.value.agent.audioInputProvider = result.data.AUDIO_INPUT_PROVIDER || 'openai'
         wizardData.value.agent.audioInputApiKey = result.data.AUDIO_INPUT_API_KEY || ''
         wizardData.value.agent.audioInputBaseUrl = result.data.AUDIO_INPUT_BASE_URL || ''
diff --git a/src/views/setting/AccountSettingSystem.vue b/src/views/setting/AccountSettingSystem.vue
index 5c92064e..5a72c1fb 100644
--- a/src/views/setting/AccountSettingSystem.vue
+++ b/src/views/setting/AccountSettingSystem.vue
@@ -58,6 +58,7 @@ const SystemSettings = ref<any>({
     LLM_API_KEY: null,
     LLM_BASE_URL: 'https://api.deepseek.com',
     LLM_BASE_URL_PRESET: null,
+    LLM_MAX_CONTEXT_TOKENS: 64,
     LLM_USER_AGENT: null,
     AUDIO_INPUT_PROVIDER: 'openai',
     AUDIO_INPUT_API_KEY: null,
@@ -74,7 +75,6 @@ const SystemSettings = ref<any>({
     AI_RECOMMEND_ENABLED: false,
     AI_RECOMMEND_USER_PREFERENCE: null,
     AI_RECOMMEND_MAX_ITEMS: 50,
-    LLM_MAX_CONTEXT_TOKENS: 64,
   },
   // 高级系统设置
   Advanced: {
@@ -1217,15 +1217,6 @@ watch(currentLlmSnapshotKey, (snapshotKey, previousSnapshotKey) => {
                         prepend-inner-icon="mdi-key-variant"
                       />
                     </VCol>
-                    <VCol v-if="SystemSettings.Basic.AI_AGENT_ENABLE && showBaseUrlField" cols="12" md="6">
-                      <VTextField
-                        v-model="SystemSettings.Basic.LLM_USER_AGENT"
-                        :label="t('setting.system.llmUserAgent')"
-                        :hint="t('setting.system.llmUserAgentHint')"
-                        persistent-hint
-                        prepend-inner-icon="mdi-card-account-details-outline"
-                      />
-                    </VCol>
                     <VCol v-if="SystemSettings.Basic.AI_AGENT_ENABLE && llmProviderAuthMethods.length > 0" cols="12">
                       <VAlert type="info" variant="tonal">
                         <div class="d-flex flex-column flex-md-row justify-space-between ga-3">
@@ -1329,6 +1320,15 @@ watch(currentLlmSnapshotKey, (snapshotKey, previousSnapshotKey) => {
                         prepend-inner-icon="mdi-counter"
                       />
                     </VCol>
+                    <VCol v-if="SystemSettings.Basic.AI_AGENT_ENABLE && showBaseUrlField" cols="12" md="6">
+                      <VTextField
+                        v-model="SystemSettings.Basic.LLM_USER_AGENT"
+                        :label="t('setting.system.llmUserAgent')"
+                        :hint="t('setting.system.llmUserAgentHint')"
+                        persistent-hint
+                        prepend-inner-icon="mdi-card-account-details-outline"
+                      />
+                    </VCol>
                     <VCol v-if="SystemSettings.Basic.AI_AGENT_ENABLE" cols="12" md="6">
                       <VSelect
                         v-model="SystemSettings.Basic.LLM_THINKING_LEVEL"
diff --git a/src/views/setup/AgentSettingsStep.vue b/src/views/setup/AgentSettingsStep.vue
index 8d705b52..8d35b2d8 100644
--- a/src/views/setup/AgentSettingsStep.vue
+++ b/src/views/setup/AgentSettingsStep.vue
@@ -357,16 +357,6 @@ onMounted(async () => {
             />
           </VCol>
 
-          <VCol v-if="showBaseUrlField" cols="12" md="6">
-            <VTextField
-              v-model="wizardData.agent.userAgent"
-              :label="t('setting.system.llmUserAgent')"
-              :hint="t('setting.system.llmUserAgentHint')"
-              persistent-hint
-              prepend-inner-icon="mdi-card-account-details-outline"
-            />
-          </VCol>
-
           <VCol v-if="providerAuthMethods.length > 0" cols="12">
             <VAlert type="info" variant="tonal">
               <div class="d-flex flex-column ga-3">
@@ -456,6 +446,16 @@ onMounted(async () => {
             />
           </VCol>
 
+          <VCol v-if="showBaseUrlField" cols="12" md="6">
+            <VTextField
+              v-model="wizardData.agent.userAgent"
+              :label="t('setting.system.llmUserAgent')"
+              :hint="t('setting.system.llmUserAgentHint')"
+              persistent-hint
+              prepend-inner-icon="mdi-card-account-details-outline"
+            />
+          </VCol>
+
           <VCol cols="12" md="6">
             <VSelect
               v-model="wizardData.agent.thinkingLevel"