diff --git a/src/domains.js b/src/domains.js
index 3f23b4d92..cfa4428a9 100644
--- a/src/domains.js
+++ b/src/domains.js
@@ -511,13 +511,17 @@ function prepareDashboardDomain(domain, auditSource, progressCallback, callback)
             if (error) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, error.message));
 
             async.series([
-                (done) => { progressCallback({ message: 'Updating DNS' }); done(); },
+                (done) => { progressCallback({ percent: 10, message: 'Updating DNS' }); done(); },
                 upsertDnsRecords.bind(null, constants.ADMIN_LOCATION, domain, 'A', [ ip ]),
-                (done) => { progressCallback({ message: 'Waiting for DNS' }); done(); },
+                (done) => { progressCallback({ percent: 40, message: 'Waiting for DNS' }); done(); },
                 waitForDnsRecord.bind(null, constants.ADMIN_LOCATION, domain, 'A', ip, { interval: 30000, times: 50000 }),
-                (done) => { progressCallback({ message: 'Getting certificate' }); done(); },
+                (done) => { progressCallback({ percent: 70, message: 'Getting certificate' }); done(); },
                 reverseProxy.ensureCertificate.bind(null, fqdn(constants.ADMIN_LOCATION, domainObject), domain, auditSource)
-            ], callback);
+            ], function (error) {
+                if (error) return callback(error);
+
+                callback(null);
+            });
         });
     });
 }
\ No newline at end of file
diff --git a/src/server.js b/src/server.js
index 4c3cca3c5..4c611022c 100644
--- a/src/server.js
+++ b/src/server.js
@@ -122,7 +122,7 @@ function initializeExpressSync() {
     // cloudron routes
     router.get ('/api/v1/cloudron/update', cloudronScope, routes.cloudron.getUpdateInfo);
     router.post('/api/v1/cloudron/update', cloudronScope, routes.cloudron.update);
-    router.post('/api/v1/cloudron/prepare_dashboard_dns', cloudronScope, routes.cloudron.prepareDashboardDomain);
+    router.post('/api/v1/cloudron/prepare_dashboard_domain', cloudronScope, routes.cloudron.prepareDashboardDomain);
     router.post('/api/v1/cloudron/set_dashboard_domain', cloudronScope, routes.cloudron.setDashboardDomain);
     router.post('/api/v1/cloudron/renew_certs', cloudronScope, routes.cloudron.renewCerts);
     router.post('/api/v1/cloudron/check_for_updates', cloudronScope, routes.cloudron.checkForUpdates);