diff --git a/webadmin/src/js/client.js b/webadmin/src/js/client.js
index 25ab3a781..e6aaf0acc 100644
--- a/webadmin/src/js/client.js
+++ b/webadmin/src/js/client.js
@@ -355,7 +355,6 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
             cert: config.cert,
             key: config.key,
             memoryLimit: config.memoryLimit,
-            altDomain: config.altDomain || null,
             xFrameOptions: config.xFrameOptions,
             robotsTxt: config.robotsTxt || null,
             enableBackup: config.enableBackup
diff --git a/webadmin/src/views/apps.html b/webadmin/src/views/apps.html
index d52951f68..703a0382d 100644
--- a/webadmin/src/views/apps.html
+++ b/webadmin/src/views/apps.html
@@ -13,36 +13,23 @@
                         <div class="form-group" ng-class="{ 'has-error': (appConfigureForm.location.$dirty && appConfigureForm.location.$invalid) || (!appConfigureForm.location.$dirty && appConfigure.error.location)  }">
                             <label class="control-label" for="appConfigureLocationInput">Location {{ appConfigure.error.location }} </label>
                             <div class="input-group form-inline">
-                                <input type="text" class="form-control" ng-model="appConfigure.location" id="appConfigureLocationInput" name="location" placeholder="{{ appConfigure.usingAltDomain ? 'other.domain.com' : 'Leave empty to use bare domain' }}" autofocus>
+                                <input type="text" class="form-control" ng-model="appConfigure.location" id="appConfigureLocationInput" 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">
-                                        {{ appConfigure.usingAltDomain ? 'External Domain' : ((!appConfigure.location ? '' : (appConfigure.domain.provider !== 'caas' ? '.' : '-')) + appConfigure.domain.domain) }}
+                                        {{ (!appConfigure.location ? '' : (appConfigure.domain.provider !== 'caas' ? '.' : '-')) + appConfigure.domain.domain }}
                                         <span class="caret"></span>
                                     </button>
                                     <ul class="dropdown-menu dropdown-menu-right" role="menu">
                                         <li ng-repeat="domain in domains">
-                                            <a href="" ng-click="useAltDomain(false, domain)">{{ domain.domain }}</a>
-                                        </li>
-                                        <li>
-                                            <a href="" ng-click="useAltDomain(true)"><i class="fa fa-star"></i> External Domain</a>
+                                            <a href="" ng-click="appConfigure.domain = domain">{{ domain.domain }}</a>
                                         </li>
                                     </ul>
                                 </div>
                             </div>
                         </div>
 
-                        <p class="text-center" ng-show="appConfigure.usingAltDomain && appConfigure.location && appConfigure.isAltDomainSubdomain()">
-                            Add a CNAME record for <b>{{ appConfigure.location }}</b> to <b>{{ appConfigure.app.cnameTarget || appConfigure.app.fqdn }}</b>
-                            <br>
-                        </p>
-
-                        <p class="text-center" ng-show="appConfigure.usingAltDomain && appConfigure.location && appConfigure.isAltDomainNaked()">
-                            Add an A record for <b>{{ appConfigure.location }}</b> to this Cloudron's public IP</b>
-                            <br>
-                        </p>
-
-                        <p class="text-center" ng-show="!appConfigure.usingAltDomain && appConfigure.location && dnsConfig.provider === 'manual' && !dnsConfig.wildcard">
+                        <p class="text-center" ng-show="appConfigure.location && dnsConfig.provider === 'manual' && !dnsConfig.wildcard">
                             <b>Add an A record manually for {{ appConfigure.location }} to this Cloudron's public IP</b>
                             <br>
                         </p>
@@ -164,13 +151,13 @@
                             </div>
                         </div>
 
-                        <input class="ng-hide" type="submit" ng-disabled="appConfigureForm.$invalid || appConfigure.busy || (appConfigure.accessRestrictionOption === 'groups' && !appConfigure.isAccessRestrictionValid()) || (appConfigure.usingAltDomain && !appConfigure.isAltDomainValid())"/>
+                        <input class="ng-hide" type="submit" ng-disabled="appConfigureForm.$invalid || appConfigure.busy || (appConfigure.accessRestrictionOption === 'groups' && !appConfigure.isAccessRestrictionValid())"/>
                     </form>
                 </fieldset>
             </div>
             <div class="modal-footer ">
                 <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-                <button type="button" class="btn btn-success" ng-click="appConfigure.submit()" ng-disabled="appConfigureForm.$invalid || appConfigure.busy || (appConfigure.accessRestrictionOption === 'groups' && !appConfigure.isAccessRestrictionValid()) || (appConfigure.usingAltDomain && !appConfigure.isAltDomainValid())"><i class="fa fa-circle-o-notch fa-spin" ng-show="appConfigure.busy"></i> Save</button>
+                <button type="button" class="btn btn-success" ng-click="appConfigure.submit()" ng-disabled="appConfigureForm.$invalid || appConfigure.busy || (appConfigure.accessRestrictionOption === 'groups' && !appConfigure.isAccessRestrictionValid())"><i class="fa fa-circle-o-notch fa-spin" ng-show="appConfigure.busy"></i> Save</button>
             </div>
         </div>
     </div>
@@ -382,7 +369,7 @@
                         <br/>
                         <div class="row">
                             <div class="col-xs-12 text-center">
-                                <div class="grid-item-top-title" data-fittext>{{ app.altDomain || app.location || app.fqdn }}</div>
+                                <div class="grid-item-top-title" data-fittext>{{ app.location || app.fqdn }}</div>
                                 <div class="text-muted status" style="text-overflow: ellipsis; white-space: nowrap; overflow: hidden">
                                   {{ app | installationStateLabel }}
                                 </div>
diff --git a/webadmin/src/views/apps.js b/webadmin/src/views/apps.js
index ef8c424b7..0201f3126 100644
--- a/webadmin/src/views/apps.js
+++ b/webadmin/src/views/apps.js
@@ -18,7 +18,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         app: {},
         domain: '',
         location: '',
-        usingAltDomain: false,
         advancedVisible: false,
         portBindings: {},
         portBindingsEnabled: {},
@@ -41,26 +40,13 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
             return !!(tmp.users.length || tmp.groups.length);
         },
 
-        isAltDomainValid: function () {
-            return ngTld.isValid($scope.appConfigure.location);
-        },
-
-        isAltDomainSubdomain: function () {
-            return ngTld.isSubdomain($scope.appConfigure.location);
-        },
-
-        isAltDomainNaked: function () {
-            return ngTld.isNakedDomain($scope.appConfigure.location);
-        },
-
         show: function (app) {
             $scope.reset();
 
             // fill relevant info from the app
             $scope.appConfigure.app = app;
-            $scope.appConfigure.location = app.altDomain || app.location;
+            $scope.appConfigure.location = app.location;
             $scope.appConfigure.domain = $scope.domains.filter(function (d) { return d.domain === app.domain; })[0];
-            $scope.appConfigure.usingAltDomain = !!app.altDomain;
             $scope.appConfigure.portBindingsInfo = app.manifest.tcpPorts || {}; // Portbinding map only for information
             $scope. Option = app.accessRestriction ? 'groups' : 'any';
             $scope.appConfigure.memoryLimit = app.memoryLimit || app.manifest.memoryLimit || (256 * 1024 * 1024);
@@ -129,9 +115,8 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
             }
 
             var data = {
-                location:  $scope.appConfigure.usingAltDomain ? $scope.appConfigure.app.location : $scope.appConfigure.location,
-                altDomain: $scope.appConfigure.usingAltDomain ? $scope.appConfigure.location : null,
-                domain: $scope.appConfigure.usingAltDomain ? undefined : $scope.appConfigure.domain.domain,
+                location:  $scope.appConfigure.location,
+                domain: $scope.appConfigure.domain.domain,
                 portBindings: finalPortBindings,
                 accessRestriction: finalAccessRestriction,
                 cert: $scope.appConfigure.certificateFile,
@@ -275,7 +260,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         $scope.appConfigure.domain = null;
         $scope.appConfigure.location = '';
         $scope.appConfigure.advancedVisible = false;
-        $scope.appConfigure.usingAltDomain = false;
         $scope.appConfigure.portBindings = {};          // This is the actual model holding the env:port pair
         $scope.appConfigure.portBindingsEnabled = {};   // This is the actual model holding the enabled/disabled flag
         $scope.appConfigure.certificateFile = null;
@@ -346,17 +330,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         });
     };
 
-    $scope.useAltDomain = function (use, domain) {
-        $scope.appConfigure.usingAltDomain = use;
-        $scope.appConfigure.domain = domain;
-
-        if (use) {
-            $scope.appConfigure.location = '';
-        } else {
-            $scope.appConfigure.location = $scope.appConfigure.app.location;
-        }
-    };
-
     $scope.showInformation = function (app) {
         $scope.reset();