diff --git a/dashboard/src/components/DomainDialog.vue b/dashboard/src/components/DomainDialog.vue
index 43c839d13..5ff18ca64 100644
--- a/dashboard/src/components/DomainDialog.vue
+++ b/dashboard/src/components/DomainDialog.vue
@@ -112,16 +112,9 @@ defineExpose({
           <TextInput id="domainInput" v-model="domain" placeholder="example.com" :readonly="editing ? true : undefined" required />
         </FormGroup>
 
-        <DomainProviderForm v-model:provider="provider" v-model:dns-config="dnsConfig" v-model:tls-provider="tlsProvider" :domain="domain" :show-advanced="showAdvanced" />
-
-        <p style="margin-top: 15px" v-show="!showAdvanced" @click="showAdvanced = true" class="actionable">{{ $t('domains.domainDialog.advancedAction') }}</p>
+        <DomainProviderForm v-model:provider="provider" v-model:dns-config="dnsConfig" v-model:tls-provider="tlsProvider" v-model:zone-name="zoneName" :domain="domain" :show-advanced="showAdvanced" />
 
         <div v-show="showAdvanced">
-          <FormGroup>
-            <label for="zoneNameInput">{{ $t('domains.domainDialog.zoneName') }} <sup><a href="https://docs.cloudron.io/domains/#zone-name" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
-            <TextInput id="zoneNameInput" v-model="zoneName" />
-          </FormGroup>
-
           <Checkbox v-model="customNameservers" :label="$t('domains.domainDialog.customNameservers')" />
 
           <!-- custom certificate -->
@@ -145,6 +138,8 @@ defineExpose({
             </div>
           </FormGroup>
         </div>
+
+        <div v-if="!showAdvanced" style="margin-top: 15px" class="actionable" @click="showAdvanced = true">{{ $t('domains.domainDialog.advancedAction') }}</div>
       </fieldset>
     </form>
   </Dialog>
diff --git a/dashboard/src/components/DomainProviderForm.vue b/dashboard/src/components/DomainProviderForm.vue
index aa8be38cf..c01006ea3 100644
--- a/dashboard/src/components/DomainProviderForm.vue
+++ b/dashboard/src/components/DomainProviderForm.vue
@@ -27,6 +27,7 @@ defineProps({
 const provider = defineModel('provider');
 const dnsConfig = defineModel('dnsConfig');
 const tlsProvider = defineModel('tlsProvider');
+const zoneName = defineModel('zoneName');
 
 const tlsProviders = [
   { name: 'Let\'s Encrypt Prod', value: 'letsencrypt-prod' },
@@ -305,6 +306,11 @@ function onGcdnsFileInputChange(event) {
       <MaskedInput id="inwxPasswordInput" v-model="dnsConfig.password" required />
     </FormGroup>
 
+    <FormGroup v-if="showAdvanced">
+      <label for="zoneNameInput">{{ $t('domains.domainDialog.zoneName') }} <sup><a href="https://docs.cloudron.io/domains/#zone-name" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+      <TextInput id="zoneNameInput" v-model="zoneName" />
+    </FormGroup>
+
     <FormGroup v-if="showAdvanced">
       <label>Certificate Provider <sup><a href="https://docs.cloudron.io/certificates/#certificate-providers" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
       <SingleSelect v-model="tlsProvider" :options="tlsProviders" option-key="value" option-label="name"/>
diff --git a/dashboard/src/views/SetupView.vue b/dashboard/src/views/SetupView.vue
index 9aaaa71a7..fdab08820 100644
--- a/dashboard/src/views/SetupView.vue
+++ b/dashboard/src/views/SetupView.vue
@@ -200,14 +200,9 @@ onMounted(async () => {
               <small class="helper-text">Apps will be installed on subdomains of this domain. The dashboard will be available on the <b>my{{ domain ? `.${domain}` : '' }}</b> subdomain. You can add more domains later.</small>
             </FormGroup>
 
-            <DomainProviderForm :disabled="busy" v-model:provider="provider" v-model:dns-config="dnsConfig" v-model:tls-provider="tlsProvider" :domain="domain" :show-advanced="showAdvanced" />
+            <DomainProviderForm :disabled="busy" v-model:provider="provider" v-model:dns-config="dnsConfig" v-model:tls-provider="tlsProvider" v-model:zone-name="zoneName" :domain="domain" :show-advanced="showAdvanced" />
 
             <div v-show="showAdvanced">
-              <FormGroup>
-                <label for="zoneNameInput">DNS Zone Name (Optional) <sup><a href="https://docs.cloudron.io/domains/#zone-name" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
-                <TextInput id="zoneNameInput" v-model="zoneName" placeholder="Defaults to TLD" />
-              </FormGroup>
-
               <!-- IPv4 provider -->
               <FormGroup>
                 <label class="control-label">IPv4 Configuration  <sup><a href="https://docs.cloudron.io/networking/#ip-configuration" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
@@ -245,8 +240,7 @@ onMounted(async () => {
               </FormGroup>
             </div>
 
-            <div style="margin-top: 1.5em" class="actionable" @click="showAdvanced = false" v-if="showAdvanced">Hide Advanced settings</div>
-            <div style="margin-top: 1.5em" class="actionable" @click="showAdvanced = true" v-else>Advanced settings...</div>
+            <div v-if="!showAdvanced" style="margin-top: 15px" class="actionable" @click="showAdvanced = true">Advanced settings...</div>
           </fieldset>
         </form>