diff --git a/frontend/src/views/SetupWizard/SetupWizard.js b/frontend/src/views/SetupWizard/SetupWizard.js
index b80efc4..6e112f9 100644
--- a/frontend/src/views/SetupWizard/SetupWizard.js
+++ b/frontend/src/views/SetupWizard/SetupWizard.js
@@ -74,7 +74,7 @@ export function useSetupWizard(props, emit) {
     admin_email: "",
     admin_password: "",
     confirm_password: "",
-    server_port: props.status.server_port || 8080,
+    server_port: props.status.mode === "bootstrap" ? 80 : (props.status.server_port || 80),
     email_http_enabled: false,
     email_smtp_enabled: false,
     email_smtp_host: "",
diff --git a/frontend/src/views/SetupWizard/SetupWizard.vue b/frontend/src/views/SetupWizard/SetupWizard.vue
index 76c6b37..43f9cb7 100644
--- a/frontend/src/views/SetupWizard/SetupWizard.vue
+++ b/frontend/src/views/SetupWizard/SetupWizard.vue
@@ -222,19 +222,6 @@ const {
               <span>先确定 Scert 主服务和管理页面的访问方式，后续步骤会使用这里的配置。</span>
             </div>
             <div class="setup-grid two-columns">
-              <label>
-                <span>Scert 主服务端口</span>
-                <input
-                  id="server-port"
-                  name="server_port"
-                  v-model.number="form.server_port"
-                  required
-                  min="1"
-                  max="65535"
-                  type="number"
-                />
-                <small>管理页面和 API 对外提供服务使用的端口。</small>
-              </label>
               <div class="access-target-field">
                 <span>管理页面访问方式</span>
                 <div class="target-switch" role="group" aria-label="管理页面访问方式">
@@ -276,6 +263,19 @@ const {
                   placeholder="203.0.113.10"
                 />
               </label>
+              <label>
+                <span>Scert 主服务端口</span>
+                <input
+                  id="server-port"
+                  name="server_port"
+                  v-model.number="form.server_port"
+                  required
+                  min="1"
+                  max="65535"
+                  type="number"
+                />
+                <small>管理页面和 API 对外提供服务使用的端口。</small>
+              </label>
             </div>
             <DatabaseSetup
               v-if="isBootstrap"
diff --git a/frontend/src/views/SetupWizard/SetupWizardLayout.css b/frontend/src/views/SetupWizard/SetupWizardLayout.css
index 2190a7a..12f979a 100644
--- a/frontend/src/views/SetupWizard/SetupWizardLayout.css
+++ b/frontend/src/views/SetupWizard/SetupWizardLayout.css
@@ -106,7 +106,7 @@
   }
 
   .access-shell--setup .setup-step-card:has(#admin-username) > .setup-grid:first-of-type {
-    grid-template-columns: repeat(4, minmax(0, 1fr));
+    grid-template-columns: repeat(2, minmax(0, 1fr));
   }
 
   .access-shell--setup .setup-step-card > .setup-section-heading + .setup-grid {