diff --git a/src/cloudron.js b/src/cloudron.js
index 8d73d8829..4271a60c7 100644
--- a/src/cloudron.js
+++ b/src/cloudron.js
@@ -386,17 +386,17 @@ function setupDnsAndCert(subdomain, domain, auditSource, progressCallback, callb
     domains.get(domain, function (error, domainObject) {
         if (error) return callback(error);
 
-        const adminFqdn = domains.fqdn(subdomain, domainObject);
+        const dashboardFqdn = domains.fqdn(subdomain, domainObject);
 
         sysinfo.getServerIp(function (error, ip) {
             if (error) return callback(error);
 
             async.series([
-                (done) => { progressCallback({ message: `Updating DNS of ${adminFqdn}` }); done(); },
+                (done) => { progressCallback({ message: `Updating DNS of ${dashboardFqdn}` }); done(); },
                 domains.upsertDnsRecords.bind(null, subdomain, domain, 'A', [ ip ]),
-                (done) => { progressCallback({ message: `Waiting for DNS of ${adminFqdn}` }); done(); },
+                (done) => { progressCallback({ message: `Waiting for DNS of ${dashboardFqdn}` }); done(); },
                 domains.waitForDnsRecord.bind(null, subdomain, domain, 'A', ip, { interval: 30000, times: 50000 }),
-                (done) => { progressCallback({ message: `Getting certificate of ${adminFqdn}` }); done(); },
+                (done) => { progressCallback({ message: `Getting certificate of ${dashboardFqdn}` }); done(); },
                 reverseProxy.ensureCertificate.bind(null, domains.fqdn(subdomain, domainObject), domain, auditSource)
             ], function (error) {
                 if (error) return callback(error);
diff --git a/src/mail.js b/src/mail.js
index 559bcf868..2e6be1a28 100644
--- a/src/mail.js
+++ b/src/mail.js
@@ -723,7 +723,7 @@ function restartMail(callback) {
     services.getServiceConfig('mail', function (error, serviceConfig) {
         if (error) return callback(error);
 
-        debug(`restartMail: restarting mail container with mailFqdn:${settings.mailFqdn()} adminDomain:${settings.dashboardDomain()}`);
+        debug(`restartMail: restarting mail container with mailFqdn:${settings.mailFqdn()} dashboardDomain:${settings.dashboardDomain()}`);
         configureMail(settings.mailFqdn(), settings.dashboardDomain(), serviceConfig, callback);
     });
 }
diff --git a/src/provision.js b/src/provision.js
index e77b4122b..4bd0813bd 100644
--- a/src/provision.js
+++ b/src/provision.js
@@ -204,13 +204,13 @@ function restore(backupConfig, backupId, version, sysinfoConfig, options, auditS
                     settings.setSysinfoConfig.bind(null, sysinfoConfig),
                     reverseProxy.restoreFallbackCertificates,
                     (done) => {
-                        const adminDomain = settings.dashboardDomain(); // load this fresh from after the backup.restore
+                        const dashboardDomain = settings.dashboardDomain(); // load this fresh from after the backup.restore
                         async.series([
                             (next) => {
                                 if (options.skipDnsSetup) return next();
-                                cloudron.setupDnsAndCert(constants.DASHBOARD_LOCATION, adminDomain, auditSource, (progress) => setProgress('restore', progress.message, NOOP_CALLBACK), next);
+                                cloudron.setupDnsAndCert(constants.DASHBOARD_LOCATION, dashboardDomain, auditSource, (progress) => setProgress('restore', progress.message, NOOP_CALLBACK), next);
                             },
-                            cloudron.setDashboardDomain.bind(null, adminDomain, auditSource)
+                            cloudron.setDashboardDomain.bind(null, dashboardDomain, auditSource)
                         ], done);
                     },
                     settings.setBackupCredentials.bind(null, backupConfig), // update just the credentials and not the policy and flags