diff --git a/webadmin/src/3rdparty/js/angular-tld.js b/webadmin/src/3rdparty/js/angular-tld.js
index bf232145b..269fc0a9b 100644
--- a/webadmin/src/3rdparty/js/angular-tld.js
+++ b/webadmin/src/3rdparty/js/angular-tld.js
@@ -8,9 +8,9 @@ angular.module('ngTld', [])
     .directive('checkTld', checkTld);
 
 function ngTld() {
-    function tldExists(path) {
+    function isValid(path) {
         // https://github.com/oncletom/tld.js/issues/58
-        return (path.slice(-1) !== '.') && path === tld.getDomain(path);
+        return (path.slice(-1) !== '.') && tld.isValid(path);
     }
 
     function isSubdomain(path) {
@@ -22,7 +22,7 @@ function ngTld() {
     }
 
     return {
-        tldExists: tldExists,
+        isValid: isValid,
         isSubdomain: isSubdomain,
         isNakedDomain: isNakedDomain
     };
diff --git a/webadmin/src/views/apps.html b/webadmin/src/views/apps.html
index 62d17b8d8..549134c33 100644
--- a/webadmin/src/views/apps.html
+++ b/webadmin/src/views/apps.html
@@ -178,14 +178,14 @@
                             </div>
                             <input type="password" class="form-control" ng-model="appConfigure.password" id="appConfigurePasswordInput" name="password" required>
                         </div>
-                        <input class="ng-hide" type="submit" ng-disabled="appConfigureForm.$invalid || busy || (appConfigure.accessRestrictionOption === 'groups' && !appConfigure.isAccessRestrictionValid())"/>
+                        <input class="ng-hide" type="submit" ng-disabled="appConfigureForm.$invalid || appConfigure.busy || (appConfigure.accessRestrictionOption === 'groups' && !appConfigure.isAccessRestrictionValid()) || (appConfigure.usingAltDomain && !appConfigure.isAltDomainValid())"/>
                     </form>
                 </fieldset>
             </div>
             <div class="modal-footer ">
                 <button type="button" class="btn btn-default pull-left" ng-click="restartApp(appConfigure.app)" ng-disabled="restartAppBusy"><i class="fa fa-circle-o-notch fa-spin" ng-show="restartAppBusy"></i> Restart</button>
                 <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-                <button type="button" class="btn btn-success" ng-click="doConfigure()" ng-disabled="appConfigureForm.$invalid || appConfigure.busy || (appConfigure.accessRestrictionOption === 'groups' && !appConfigure.isAccessRestrictionValid()) || !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="doConfigure()" 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>
             </div>
         </div>
     </div>
diff --git a/webadmin/src/views/apps.js b/webadmin/src/views/apps.js
index 27a650db8..03c326bf1 100644
--- a/webadmin/src/views/apps.js
+++ b/webadmin/src/views/apps.js
@@ -42,7 +42,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         },
 
         isAltDomainValid: function () {
-            return ngTld.tldExists($scope.appConfigure.location);
+            return ngTld.isValid($scope.appConfigure.location);
         },
 
         isAltDomainSubdomain: function () {