diff --git a/src/js/setupdns.js b/src/js/setupdns.js
index 87f89f121..a4f9fc859 100644
--- a/src/js/setupdns.js
+++ b/src/js/setupdns.js
@@ -21,6 +21,7 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
     $scope.instanceId = '';
     $scope.isDomain = false;
     $scope.isSubdomain = false;
+    $scope.hyphenatedSubdomains = false;
     $scope.tlsProvider = [
         { name: 'Let\'s Encrypt Prod', value: 'letsencrypt-prod' },
         { name: 'Let\'s Encrypt Staging', value: 'letsencrypt-staging' },
@@ -76,7 +77,8 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
         zoneName: '',
         tlsConfig: {
             provider: 'letsencrypt-prod'
-        }
+        },
+        hyphenatedSubdomains: false
     };
 
     function readFileLocally(obj, file, fileName) {
@@ -105,7 +107,8 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
         var provider = $scope.dnsCredentials.provider;
 
         var data = {
-            providerToken: $scope.instanceId
+            providerToken: $scope.instanceId,
+            hyphenatedSubdomains: $scope.hyphenatedSubdomains
         };
 
         // special case the wildcard provider
@@ -200,6 +203,7 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
 
             $scope.instanceId = search.instanceId;
             $scope.provider = status.provider;
+            $scope.hyphenatedSubdomains = status.edition === 'hostingprovider';
             $scope.state = 'initialized';
         });
     }
diff --git a/src/setupdns.html b/src/setupdns.html
index dc2077e79..3bfb1e1e8 100644
--- a/src/setupdns.html
+++ b/src/setupdns.html
@@ -171,6 +171,13 @@
 
                                 <br/>
                                 <div  uib-collapse="!dnsCredentials.advancedVisible">
+
+                                    <div class="checkbox" ng-show="hyphenatedSubdomains">
+                                        <label>
+                                            <input type="checkbox" ng-model="dnsCredentials.hyphenatedSubdomains" name="hyphenatedSubdomains" ng-disabled="dnsCredentials.busy"/>Hyphenate Subdomains
+                                        </label>
+                                    </div>
+
                                     <div class="form-group">
                                         <label class="control-label">Zone Name (Optional)</label>
                                         <input type="text" class="form-control" ng-model="dnsCredentials.zoneName" name="zoneName" placeholder="{{dnsCredentials.domain | zoneName}}" ng-disabled="dnsCredentials.busy">