diff --git a/src/js/client.js b/src/js/client.js
index 04ca56cef..91b514249 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -779,17 +779,18 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
         }).error(defaultErrorHandler(callback));
     };
 
-    Client.prototype.setupDnsConfig = function (domain, zoneName, provider, dnsConfig, tlsConfig, callback) {
+    Client.prototype.setup = function (domain, zoneName, provider, config, tlsConfig, callback) {
         var data = {
-            domain: domain,
-            adminFqdn: 'my' + (dnsConfig.hyphenatedSubdomains ? '-' : '.' ) + domain,
-            zoneName: zoneName,
-            provider: provider,
-            config: dnsConfig,
-            tlsConfig: tlsConfig
+            dnsConfig: {
+                domain: domain,
+                zoneName: zoneName,
+                provider: provider,
+                config: config,
+                tlsConfig: tlsConfig
+            }
         };
 
-        post('/api/v1/cloudron/dns_setup', data).success(function(data, status) {
+        post('/api/v1/cloudron/setup', data).success(function(data, status) {
             if (status !== 200) return callback(new ClientError(status, data));
             callback(null);
         }).error(defaultErrorHandler(callback));
diff --git a/src/js/setupdns.js b/src/js/setupdns.js
index 90cda08a9..c674c1e53 100644
--- a/src/js/setupdns.js
+++ b/src/js/setupdns.js
@@ -173,7 +173,7 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
             tlsConfig.wildcard = true;
         }
 
-        Client.setupDnsConfig($scope.dnsCredentials.domain, $scope.dnsCredentials.zoneName, provider, data, tlsConfig, function (error) {
+        Client.setup($scope.dnsCredentials.domain, $scope.dnsCredentials.zoneName, provider, data, tlsConfig, function (error) {
             if (error && error.statusCode === 401) {
                 $scope.dnsCredentials.busy = false;
                 $scope.error = 'Wrong instance id provided.';