diff --git a/src/js/setupdns.js b/src/js/setupdns.js
index 3f7fafd08..6702eb640 100644
--- a/src/js/setupdns.js
+++ b/src/js/setupdns.js
@@ -21,7 +21,6 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
     $scope.instanceId = '';
     $scope.isDomain = false;
     $scope.isSubdomain = false;
-    $scope.hyphenatedSubdomains = false;
     $scope.advancedVisible = false;
     $scope.webServerOrigin = '';
     $scope.clipboardDone = false;
@@ -112,8 +111,7 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
         zoneName: '',
         tlsConfig: {
             provider: 'letsencrypt-prod-wildcard'
-        },
-        hyphenatedSubdomains: false
+        }
     };
 
     $scope.setDefaultTlsProvider = function () {
@@ -151,9 +149,7 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
 
         var provider = $scope.dnsCredentials.provider;
 
-        var config = {
-            hyphenatedSubdomains: $scope.dnsCredentials.hyphenatedSubdomains
-        };
+        var config = {};
 
         if (provider === 'route53') {
             config.accessKeyId = $scope.dnsCredentials.accessKeyId;
diff --git a/src/setupdns.html b/src/setupdns.html
index aed0cb4e5..4663d48db 100644
--- a/src/setupdns.html
+++ b/src/setupdns.html
@@ -214,14 +214,6 @@
 
                                 <br/>
                                 <div uib-collapse="!advancedVisible">
-                                    <div ng-show="false">
-                                        <label>
-                                            <input type="checkbox" ng-model="dnsCredentials.hyphenatedSubdomains" name="hyphenatedSubdomains" ng-disabled="dnsCredentials.busy"/>&nbsp; Hyphenate Subdomains
-                                        </label>
-                                        <p>When enabled, apps are installed into <code>&lt;location&gt;-&lt;domain&gt;</code></p>
-                                        <br/>
-                                    </div>
-
                                     <div class="form-group">
                                         <label class="control-label">Zone Name (Optional) <sup><a ng-href="{{ webServerOrigin }}/documentation/domains/#zone-name" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
                                         <input type="text" class="form-control" ng-model="dnsCredentials.zoneName" name="zoneName" placeholder="{{dnsCredentials.domain | zoneName}}" ng-disabled="dnsCredentials.busy">
diff --git a/src/views/app.html b/src/views/app.html
index 74e695c02..d5a8cd3ab 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -102,7 +102,7 @@
 
             <div class="input-group-btn">
               <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                <span>{{ (!repair.location ? '' : (repair.domain.config.hyphenatedSubdomains ? '-' : '.')) + repair.domain.domain }}</span>
+                <span>{{ (!repair.location ? '' : '.') + repair.domain.domain }}</span>
                 <span class="caret"></span>
               </button>
               <ul class="dropdown-menu dropdown-menu-right" role="menu">
@@ -116,7 +116,7 @@
         <div ng-show="repair.alternateDomains.length">
           <p ng-repeat="alternateDomain in repair.alternateDomains">
             <label class="control-label"><input type="checkbox" ng-model="alternateDomain.enabled">
-               {{ alternateDomain.subdomain + (!alternateDomain.subdomain ? '' : (alternateDomain.domain.config.hyphenatedSubdomains ? '-' : '.')) + alternateDomain.domain.domain }}
+               {{ alternateDomain.subdomain + (!alternateDomain.subdomain ? '' : '.') + alternateDomain.domain.domain }}
               </label>
           </p>
         </div>
@@ -370,7 +370,7 @@
                 <input type="text" class="form-control" ng-model="clone.location" id="cloneLocationInput" name="location" placeholder="Leave empty to use bare domain" autofocus>
                 <div class="input-group-btn">
                   <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                    <span>{{ (!clone.location ? '' : (clone.domain.config.hyphenatedSubdomains ? '-' : '.')) + clone.domain.domain }}</span>
+                    <span>{{ (!clone.location ? '' : '.') + clone.domain.domain }}</span>
                     <span class="caret"></span>
                   </button>
                   <ul class="dropdown-menu dropdown-menu-right" role="menu">
@@ -540,7 +540,7 @@
 
                     <div class="input-group-btn">
                       <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                        <span>{{ (!location.location ? '' : (location.domain.config.hyphenatedSubdomains ? '-' : '.')) + location.domain.domain }}</span>
+                        <span>{{ (!location.location ? '' : '.') + location.domain.domain }}</span>
                         <span class="caret"></span>
                       </button>
                       <ul class="dropdown-menu dropdown-menu-right" role="menu">
@@ -592,7 +592,7 @@
 
                         <div class="input-group-btn">
                           <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                            <span>{{ (!alternateDomain.subdomain ? '' : (alternateDomain.domain.config.hyphenatedSubdomains ? '-' : '.')) + alternateDomain.domain.domain }}</span>
+                            <span>{{ (!alternateDomain.subdomain ? '' : '.') + alternateDomain.domain.domain }}</span>
                             <span class="caret"></span>
                           </button>
                           <ul class="dropdown-menu dropdown-menu-right" role="menu">
diff --git a/src/views/appstore.html b/src/views/appstore.html
index 2fa692f19..e59c7f412 100644
--- a/src/views/appstore.html
+++ b/src/views/appstore.html
@@ -24,7 +24,7 @@
                 <input type="text" class="form-control" ng-model="appInstall.location" id="appInstallLocationInput" name="location" placeholder="Leave empty to use bare domain" autofocus>
                 <div class="input-group-btn">
                   <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                    <span>{{ (appInstall.location ? (appInstall.domain.config.hyphenatedSubdomains ? '-' : '.') : '') + appInstall.domain.domain }}</span>
+                    <span>{{ (appInstall.location ? '.' : '') + appInstall.domain.domain }}</span>
                     <span class="caret"></span>
                   </button>
                   <ul class="dropdown-menu dropdown-menu-right" role="menu">
diff --git a/src/views/domains.html b/src/views/domains.html
index 48f8de345..794af674e 100644
--- a/src/views/domains.html
+++ b/src/views/domains.html
@@ -147,14 +147,6 @@
 
             <a href="" ng-click="domainConfigure.advancedVisible = true" ng-hide="domainConfigure.advancedVisible">Advanced settings...</a>
             <div  uib-collapse="!domainConfigure.advancedVisible">
-
-              <div ng-show="false">
-                <label class="control-label">
-                  <input type="checkbox" ng-model="domainConfigure.hyphenatedSubdomains" name="hyphenatedSubdomains" ng-disabled="domainConfigure.busy"/>&nbsp; Hyphenate Subdomains
-                </label>
-                <p>When enabled, apps are installed into <code>&lt;location&gt;-&lt;domain&gt;</code></p>
-              </div>
-
               <div class="form-group">
                 <label class="control-label">Zone Name (Optional) <sup><a ng-href="{{ config.webServerOrigin }}/documentation/domains/#zone-name" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
                 <input type="text" class="form-control" ng-model="domainConfigure.zoneName" name="zoneName" ng-disabled="domainConfigure.busy">
diff --git a/src/views/domains.js b/src/views/domains.js
index 7d2faa627..92d9a5913 100644
--- a/src/views/domains.js
+++ b/src/views/domains.js
@@ -143,7 +143,6 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
         namecheapApiKey: '',
         provider: 'route53',
         zoneName: '',
-        hyphenatedSubdomains: false,
 
         tlsConfig: {
             provider: 'letsencrypt-prod-wildcard'
@@ -208,8 +207,6 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
                     if (domain.tlsConfig.wildcard) $scope.domainConfigure.tlsConfig.provider += '-wildcard';
                 }
                 $scope.domainConfigure.zoneName = domain.zoneName;
-
-                $scope.domainConfigure.hyphenatedSubdomains = !!domain.config.hyphenatedSubdomains;
             } else {
                 $scope.domainConfigure.adding = true;
             }
@@ -266,8 +263,6 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
                 data.username = $scope.domainConfigure.namecheapUsername;
             }
 
-            data.hyphenatedSubdomains = $scope.domainConfigure.hyphenatedSubdomains;
-
             var fallbackCertificate = null;
             if ($scope.domainConfigure.fallbackCert.certificateFile && $scope.domainConfigure.fallbackCert.keyFile) {
                 fallbackCertificate = {
@@ -332,8 +327,6 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
             $scope.domainConfigure.tlsConfig.provider = 'letsencrypt-prod';
             $scope.domainConfigure.zoneName = '';
 
-            $scope.domainConfigure.hyphenatedSubdomains = false;
-
             $scope.domainConfigureForm.$setPristine();
             $scope.domainConfigureForm.$setUntouched();
         }