diff --git a/src/cloudron.js b/src/cloudron.js
index a6730dcb0..4b1f96031 100644
--- a/src/cloudron.js
+++ b/src/cloudron.js
@@ -764,9 +764,9 @@ function migrate(options, callback) {
 
     if (!options.domain) return doMigrate(options, callback);
 
-    var dnsConfig = _.pick(options, 'provider', 'accessKeyId', 'secretAccessKey', 'region', 'endpoint');
+    var dnsConfig = _.pick(options, 'domain', 'provider', 'accessKeyId', 'secretAccessKey', 'region', 'endpoint');
 
-    settings.setDnsConfig(options.domain, dnsConfig, function (error) {
+    settings.setDnsConfig(dnsConfig, function (error) {
         if (error && error.reason === SettingsError.BAD_FIELD) return callback(new CloudronError(CloudronError.BAD_FIELD, error.message));
         if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
 
diff --git a/src/settings.js b/src/settings.js
index 26a33ac99..3f187ff89 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -300,7 +300,7 @@ function setDnsConfig(dnsConfig, callback) {
             endpoint: dnsConfig.endpoint || null
         };
 
-        validator = validateRoute53Config.bind(null, config.fqdn());
+        validator = validateRoute53Config.bind(null, dnsConfig.domain || config.fqdn());
     } else if (dnsConfig.provider === 'caas') {
         credentials = {
             provider: dnsConfig.provider