diff --git a/webadmin/src/js/setupdns.js b/webadmin/src/js/setupdns.js
index bb0848107..276ed85a5 100644
--- a/webadmin/src/js/setupdns.js
+++ b/webadmin/src/js/setupdns.js
@@ -24,6 +24,9 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
     $scope.isDomain = false;
     $scope.isSubdomain = false;
 
+    // If we migrate the api origin we have to poll the new location
+    if (search.admin_fqdn) Client.apiOrigin = 'https://' + search.admin_fqdn;
+
     $scope.$watch('dnsCredentials.domain', function (newVal) {
         if (!newVal) {
             $scope.isDomain = false;
diff --git a/webadmin/src/views/domains.js b/webadmin/src/views/domains.js
index 95faafb0b..d1d8218b0 100644
--- a/webadmin/src/views/domains.js
+++ b/webadmin/src/views/domains.js
@@ -199,6 +199,8 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
         },
 
         submit: function () {
+            var setupDNSUrl = '/setupdns.html?admin_fqdn=my' + ($scope.domainMigrate.domain.provider === 'caas' ? '-' : '.') + $scope.domainMigrate.domain.domain;
+
             $scope.domainMigrate.busy = true;
             $scope.domainMigrate.error = null;
 
@@ -214,7 +216,7 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
                     $('#domainMigrateModal').modal('hide');
                     $scope.domainMigrate.reset();
 
-                    window.location.href = '/setupdns.html';
+                    window.location.href = setupDNSUrl;
                 }
 
                 $scope.domainMigrate.busy = false;