diff --git a/src/clientdb.js b/src/clientdb.js
index 8cf18cdaa..4b2f0416e 100644
--- a/src/clientdb.js
+++ b/src/clientdb.js
@@ -15,8 +15,7 @@ exports = module.exports = {
     delByAppId: delByAppId,
     delByAppIdAndType: delByAppIdAndType,
 
-    _clear: clear,
-    _addDefaultClients: addDefaultClients
+    _clear: clear
 };
 
 var assert = require('assert'),
@@ -179,11 +178,3 @@ function clear(callback) {
         callback(null);
     });
 }
-
-function addDefaultClients(callback) {
-    async.series([
-        add.bind(null, 'cid-webadmin', 'Settings', 'built-in', 'secret-webadmin', 'https://admin-localhost', '*'),
-        add.bind(null, 'cid-sdk', 'SDK', 'built-in', 'secret-sdk', 'https://admin-localhost', '*'),
-        add.bind(null, 'cid-cli', 'Cloudron Tool', 'built-in', 'secret-cli', 'https://admin-localhost', '*')
-    ], callback);
-}
diff --git a/src/database.js b/src/database.js
index 2165405f5..cdb437c8d 100644
--- a/src/database.js
+++ b/src/database.js
@@ -105,7 +105,7 @@ function clear(callback) {
 
     async.series([
         child_process.exec.bind(null, cmd),
-        require('./clientdb.js')._addDefaultClients
+        require('./clients.js').addDefaultClients.bind(null, 'https://admin-localhost')
     ], callback);
 }