diff --git a/setup/argparser.sh b/setup/argparser.sh
index 5b209098a..94cc880ad 100644
--- a/setup/argparser.sh
+++ b/setup/argparser.sh
@@ -6,6 +6,7 @@ json="${source_dir}/../node_modules/.bin/json"
 # IMPORTANT: Fix cloudron.js:doUpdate if you add/remove any arg. keep these sorted for readability
 arg_api_server_origin=""
 arg_fqdn=""
+arg_admin_domain=""
 arg_admin_location=""
 arg_admin_fqdn=""
 arg_retire_reason=""
@@ -36,6 +37,9 @@ while true; do
         arg_admin_location=$(echo "$2" | $json adminLocation)
         [[ "${arg_admin_location}" == "" ]] && arg_admin_location="my"
 
+        arg_admin_domain=$(echo "$2" | $json adminDomain)
+        [[ "${arg_admin_domain}" == "" ]] && arg_admin_domain="${arg_fqdn}"
+
         # only update/restore have this valid (but not migrate)
         arg_api_server_origin=$(echo "$2" | $json apiServerOrigin)
         [[ "${arg_api_server_origin}" == "" ]] && arg_api_server_origin="https://api.cloudron.io"
diff --git a/setup/start.sh b/setup/start.sh
index cac72fd60..127aa8c23 100755
--- a/setup/start.sh
+++ b/setup/start.sh
@@ -213,6 +213,7 @@ cat > "${CONFIG_DIR}/cloudron.conf" <<CONF_END
     "apiServerOrigin": "${arg_api_server_origin}",
     "webServerOrigin": "${arg_web_server_origin}",
     "fqdn": "${arg_fqdn}",
+    "adminDomain": "${arg_admin_domain}",
     "adminFqdn": "${arg_admin_fqdn}",
     "adminLocation": "${arg_admin_location}",
     "provider": "${arg_provider}",
diff --git a/src/cloudron.js b/src/cloudron.js
index 54d60f2a4..f6555975c 100644
--- a/src/cloudron.js
+++ b/src/cloudron.js
@@ -265,7 +265,7 @@ function configureWebadmin(callback) {
     function configureNginx(error) {
         debug('configureNginx: dns update: %j', error || {});
 
-        certificates.ensureCertificate({ domain: config.fqdn(), location: config.adminLocation(), intrinsicFqdn: config.adminFqdn() }, function (error, certFilePath, keyFilePath) {
+        certificates.ensureCertificate({ domain: config.adminDomain(), location: config.adminLocation(), intrinsicFqdn: config.adminFqdn() }, function (error, certFilePath, keyFilePath) {
             if (error) return done(error);
 
             gWebadminStatus.tls = true;
@@ -296,10 +296,10 @@ function configureWebadmin(callback) {
     sysinfo.getPublicIp(function (error, ip) {
         if (error) return configureNginx(error);
 
-        addWebadminDnsRecord(ip, config.fqdn(), function (error) {
+        addWebadminDnsRecord(ip, config.adminDomain(), function (error) {
             if (error) return configureNginx(error);
 
-            domains.waitForDNSRecord(config.adminFqdn(), config.fqdn(), ip, 'A', { interval: 30000, times: 50000 }, function (error) {
+            domains.waitForDNSRecord(config.adminFqdn(), config.adminDomain(), ip, 'A', { interval: 30000, times: 50000 }, function (error) {
                 if (error) return configureNginx(error);
 
                 gWebadminStatus.dns = true;
@@ -448,7 +448,7 @@ function getConfig(callback) {
             callback(null, {
                 apiServerOrigin: config.apiServerOrigin(),
                 webServerOrigin: config.webServerOrigin(),
-                fqdn: config.fqdn(),
+                adminDomain: config.adminDomain(),
                 adminLocation: config.adminLocation(),
                 adminFqdn: config.adminFqdn(),
                 mailFqdn: config.mailFqdn(),
@@ -596,7 +596,7 @@ function doUpdate(boxUpdateInfo, callback) {
             provider: config.provider(),
             apiServerOrigin: config.apiServerOrigin(),
             webServerOrigin: config.webServerOrigin(),
-            fqdn: config.fqdn(),
+            adminDomain: config.adminDomain(),
             adminFqdn: config.adminFqdn(),
             adminLocation: config.adminLocation(),
             isDemo: config.isDemo(),
diff --git a/src/config.js b/src/config.js
index da938b6c2..18bdc5275 100644
--- a/src/config.js
+++ b/src/config.js
@@ -17,6 +17,7 @@ exports = module.exports = {
     apiServerOrigin: apiServerOrigin,
     webServerOrigin: webServerOrigin,
     fqdn: fqdn,
+    adminDomain: adminDomain,
     setFqdn: setFqdn,
     setAdminFqdn: setAdminFqdn,
     setAdminLocation: setAdminLocation,
@@ -73,6 +74,7 @@ function saveSync() {
         apiServerOrigin: data.apiServerOrigin,
         webServerOrigin: data.webServerOrigin,
         fqdn: data.fqdn,
+        adminDomain: data.adminDomain,
         adminFqdn: data.adminFqdn,
         adminLocation: data.adminLocation,
         provider: data.provider,
@@ -94,6 +96,7 @@ function initConfig() {
     // setup defaults
     data.fqdn = '';
     data.adminFqdn = '';
+    data.adminDomain = '';
     data.adminLocation = 'my';
     data.port = 3000;
     data.version = null;
@@ -162,7 +165,11 @@ function setFqdn(fqdn) {
 }
 
 function fqdn() {
-    return get('fqdn');
+    return get('adminDomain');
+}
+
+function adminDomain() {
+    return get('adminDomain');
 }
 
 function mailLocation() {
diff --git a/src/dyndns.js b/src/dyndns.js
index 88d289d4a..45b9b4bdb 100644
--- a/src/dyndns.js
+++ b/src/dyndns.js
@@ -23,7 +23,7 @@ function sync(callback) {
 
         debug('refreshDNS: current ip %s', ip);
 
-        domains.upsertDNSRecords(config.adminLocation(), config.fqdn(), 'A', [ ip ], function (error) {
+        domains.upsertDNSRecords(config.adminLocation(), config.adminDomain(), 'A', [ ip ], function (error) {
             if (error) return callback(error);
 
             debug('refreshDNS: done for admin location');
diff --git a/src/mail.js b/src/mail.js
index a056aa385..b3e0d5c9d 100644
--- a/src/mail.js
+++ b/src/mail.js
@@ -607,7 +607,7 @@ function ensureDkimKey(domain, callback) {
 function txtRecordsWithSpf(callback) {
     assert.strictEqual(typeof callback, 'function');
 
-    domains.getDNSRecords('', config.fqdn(), 'TXT', function (error, txtRecords) {
+    domains.getDNSRecords('', config.adminDomain(), 'TXT', function (error, txtRecords) {
         if (error) return callback(error);
 
         debug('txtRecordsWithSpf: current txt records - %j', txtRecords);
diff --git a/src/platform.js b/src/platform.js
index 7f99923fd..a2bd0bbb0 100644
--- a/src/platform.js
+++ b/src/platform.js
@@ -273,7 +273,7 @@ function startApps(existingInfra, callback) {
 function handleCertChanged(cn) {
     assert.strictEqual(typeof cn, 'string');
 
-    if (cn === '*.' + config.fqdn() || cn === config.adminFqdn()) {
+    if (cn === '*.' + config.adminDomain() || cn === config.adminFqdn()) {
         mail.startMail(NOOP_CALLBACK);
     }
 }
diff --git a/src/settings.js b/src/settings.js
index 300a3868b..d1d40ce57 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -397,7 +397,7 @@ function setAppstoreConfig(appstoreConfig, callback) {
         function registerCloudron() {
             const url = config.apiServerOrigin() + '/api/v1/users/' + appstoreConfig.userId + '/cloudrons';
             const data = {
-                domain: config.fqdn()
+                domain: config.adminDomain()
             };
 
             superagent.post(url).send(data).query({ accessToken: appstoreConfig.token }).timeout(30 * 1000).end(function (error, result) {