diff --git a/dashboard/src/components/DomainDialog.vue b/dashboard/src/components/DomainDialog.vue
index 54f5b4a49..e2f5c3f54 100644
--- a/dashboard/src/components/DomainDialog.vue
+++ b/dashboard/src/components/DomainDialog.vue
@@ -151,12 +151,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" v-model:zone-name="zoneName" :domain="domain" :show-advanced="showAdvanced" />
+        <DomainProviderForm v-model:provider="provider" v-model:dns-config="dnsConfig" v-model:tls-provider="tlsProvider" v-model:zone-name="zoneName" v-model:custom-nameservers="customNameservers" :domain="domain" :show-advanced="showAdvanced" />
 
         <div v-show="showAdvanced">
-          <Checkbox v-model="customNameservers" :label="$t('domains.domainDialog.customNameservers')" />
-
-          <!-- custom certificate -->
           <div v-if="tlsProvider === 'fallback'">
             <label>{{ $t('domains.domainDialog.fallbackCertCustomCert') }}</label>
             <p v-html="$t('domains.domainDialog.fallbackCertCustomCertInfo', { customCertLink: 'https://docs.cloudron.io/certificates/#custom-certificates' })"></p>
diff --git a/dashboard/src/components/DomainProviderForm.vue b/dashboard/src/components/DomainProviderForm.vue
index c01006ea3..f910ead1c 100644
--- a/dashboard/src/components/DomainProviderForm.vue
+++ b/dashboard/src/components/DomainProviderForm.vue
@@ -28,6 +28,7 @@ const provider = defineModel('provider');
 const dnsConfig = defineModel('dnsConfig');
 const tlsProvider = defineModel('tlsProvider');
 const zoneName = defineModel('zoneName');
+const customNameservers = defineModel('customNameservers');
 
 const tlsProviders = [
   { name: 'Let\'s Encrypt Prod', value: 'letsencrypt-prod' },
@@ -311,6 +312,9 @@ function onGcdnsFileInputChange(event) {
       <TextInput id="zoneNameInput" v-model="zoneName" />
     </FormGroup>
 
+
+    <Checkbox v-if="showAdvanced" v-model="customNameservers" :label="$t('domains.domainDialog.customNameservers')" />
+
     <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/models/DomainsModel.js b/dashboard/src/models/DomainsModel.js
index 5149d6de3..14b4ea484 100644
--- a/dashboard/src/models/DomainsModel.js
+++ b/dashboard/src/models/DomainsModel.js
@@ -90,7 +90,10 @@ function filterConfigForProvider(provider, config) {
       break;
   }
 
-  const ret = {};
+  const ret = {
+    customNameservers: !!config.customNameservers,
+  };
+
   for (const p of props) ret[p] = config[p];
   return ret;
 }
@@ -110,6 +113,7 @@ function createEmptyConfig() {
     credentials: { client_email: '', private_key: '' },
     customerNumber: '',
     defaultProxyStatus: false,
+    customNameservers: false,
     email: '',
     endpoint: '',
     password: '',
diff --git a/dashboard/src/views/SetupView.vue b/dashboard/src/views/SetupView.vue
index fdab08820..433fa3e14 100644
--- a/dashboard/src/views/SetupView.vue
+++ b/dashboard/src/views/SetupView.vue
@@ -31,8 +31,9 @@ const setupToken = ref('');
 const zoneName = ref('');
 const provider = ref('');
 const dnsConfig = ref(DomainsModel.createEmptyConfig());
-const tlsProvider = ref('letsencrypt-prod-wildcard');
+const tlsProvider = ref('letsenc-prod-wildcard');
 const showAdvanced = ref(false);
+const customNameservers = ref(false);
 const ipv4Provider = ref('generic');
 const ipv4Address = ref('');
 const ipv4Interface = ref('');
@@ -200,7 +201,7 @@ 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" v-model:zone-name="zoneName" :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" v-model:custom-nameservers="customNameservers" :domain="domain" :show-advanced="showAdvanced" />
 
             <div v-show="showAdvanced">
               <!-- IPv4 provider -->