diff --git a/src/clients.js b/src/clients.js
index 5266abe16..a31488dcd 100644
--- a/src/clients.js
+++ b/src/clients.js
@@ -39,7 +39,6 @@ var apps = require('./apps.js'),
     assert = require('assert'),
     async = require('async'),
     clientdb = require('./clientdb.js'),
-    config = require('./config.js'),
     DatabaseError = require('./databaseerror.js'),
     debug = require('debug')('box:clients'),
     hat = require('hat'),
@@ -318,7 +317,8 @@ function delToken(clientId, tokenId, callback) {
     });
 }
 
-function addDefaultClients(callback) {
+function addDefaultClients(origin, callback) {
+    assert.strictEqual(typeof origin, 'string');
     assert.strictEqual(typeof callback, 'function');
 
     debug('Adding default clients');
@@ -329,8 +329,8 @@ function addDefaultClients(callback) {
 
     // id, appId, type, clientSecret, redirectURI, scope
     async.series([
-        clientdb.upsert.bind(null, 'cid-webadmin', 'Settings', 'built-in', 'secret-webadmin', config.adminOrigin(), ADMIN_SCOPES),
-        clientdb.upsert.bind(null, 'cid-sdk', 'SDK', 'built-in', 'secret-sdk', config.adminOrigin(), '*,roleSdk'),
-        clientdb.upsert.bind(null, 'cid-cli', 'Cloudron Tool', 'built-in', 'secret-cli', config.adminOrigin(), '*, roleSdk')
+        clientdb.upsert.bind(null, 'cid-webadmin', 'Settings', 'built-in', 'secret-webadmin', origin, ADMIN_SCOPES),
+        clientdb.upsert.bind(null, 'cid-sdk', 'SDK', 'built-in', 'secret-sdk', origin, '*,roleSdk'),
+        clientdb.upsert.bind(null, 'cid-cli', 'Cloudron Tool', 'built-in', 'secret-cli', origin, '*, roleSdk')
     ], callback);
 }
diff --git a/src/cloudron.js b/src/cloudron.js
index f2777265e..fb04c2a7e 100644
--- a/src/cloudron.js
+++ b/src/cloudron.js
@@ -108,7 +108,7 @@ function initialize(callback) {
         certificates.initialize,
         settings.initialize,
         configureDefaultServer,
-        onDomainConfigured,
+        cron.initialize, // required for caas heartbeat before activation
         onActivated
     ], function (error) {
         if (error) return callback(error);
@@ -130,17 +130,6 @@ function uninitialize(callback) {
     ], callback);
 }
 
-function onDomainConfigured(callback) {
-    callback = callback || NOOP_CALLBACK;
-
-    if (!config.adminFqdn()) return callback();
-
-    async.series([
-        clients.addDefaultClients,
-        cron.initialize // required for caas heartbeat before activation
-    ], callback);
-}
-
 function onActivated(callback) {
     callback = callback || NOOP_CALLBACK;
 
@@ -213,10 +202,9 @@ function dnsSetup(adminFqdn, domain, zoneName, provider, dnsConfig, callback) {
             config.setAdminLocation('my');
             config.setZoneName(zoneName);
 
-            callback();
+            clients.addDefaultClients(config.adminOrigin(), callback);
 
             async.series([ // do not block
-                onDomainConfigured,
                 configureWebadmin
             ], NOOP_CALLBACK);
         });