diff --git a/src/js/client.js b/src/js/client.js
index aa3c9a858..46b64d854 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -784,7 +784,7 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
     Client.prototype.setupDnsConfig = function (domain, zoneName, provider, dnsConfig, tlsConfig, callback) {
         var data = {
             domain: domain,
-            adminFqdn: 'my.' + domain,
+            adminFqdn: 'my' + (dnsConfig.hyphenatedSubdomains ? '-' : '.' ) + domain,
             zoneName: zoneName,
             provider: provider,
             config: dnsConfig,