diff --git a/src/views/apps.html b/src/views/apps.html
index 3720de585..2b54d737b 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -130,12 +130,14 @@
 
                                     <div class="input-group-btn">
                                       <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" ng-disabled="!appConfigure.alternateDomainEnabled">
-                                        {{ (!appConfigure.alternateSubdomain ? '' : '.') + appConfigure.alternateDomain }}
+                                        <!-- the admin check is to check for spaces user -->
+                                        <span ng-if="user.admin">{{ (!appConfigure.alternateSubdomain ? '' : (appConfigure.alternateDomain.config.hyphenatedSubdomains ? '-' : '.')) + appConfigure.alternateDomain.domain }}</span>
+                                        <span ng-if="!user.admin">{{ (!appConfigure.alternateSubdomain ? '' : '-') + spacesSuffix + (appConfigure.alternateDomain.config.hyphenatedSubdomains ? '-' : '.') + appConfigure.alternateDomain.domain }}</span>
                                         <span class="caret"></span>
                                       </button>
                                       <ul class="dropdown-menu dropdown-menu-right" role="menu">
                                         <li ng-repeat="domain in domains">
-                                          <a href="" ng-click="appConfigure.alternateDomain = domain.domain">{{ domain.domain }}</a>
+                                          <a href="" ng-click="appConfigure.alternateDomain = domain">{{ domain.domain }}</a>
                                         </li>
                                       </ul>
                                     </div>
diff --git a/src/views/apps.js b/src/views/apps.js
index d6fbd0ed4..dcedd7c0e 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -17,7 +17,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         busy: false,
         error: {},
         app: {},
-        domain: '',
+        domain: null,
         location: '',
         advancedVisible: false,
         portBindings: {},
@@ -37,7 +37,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         xFrameOptions: '',
         alternateDomainEnabled: false,
         alternateSubdomain: '',
-        alternateDomain: '',
+        alternateDomain: null,
         ssoAuth: false,
 
         isAccessRestrictionValid: function () {
@@ -61,7 +61,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
             $scope.appConfigure.xFrameOptions = app.xFrameOptions.indexOf('ALLOW-FROM') === 0 ? app.xFrameOptions.split(' ')[1] : '';
             $scope.appConfigure.alternateDomainEnabled = !!app.alternateDomains[0];
             $scope.appConfigure.alternateSubdomain = app.alternateDomains[0] ? app.alternateDomains[0].subdomain : '';
-            $scope.appConfigure.alternateDomain = app.alternateDomains[0] ? app.alternateDomains[0].domain : $scope.appConfigure.domain.domain;
+            $scope.appConfigure.alternateDomain = app.alternateDomains[0] ? $scope.domains.filter(function (d) { return d.domain === app.alternateDomains[0].domain; })[0] : $scope.appConfigure.domain;
             $scope.appConfigure.robotsTxt = app.robotsTxt;
             $scope.appConfigure.enableBackup = app.enableBackup;
             $scope.appConfigure.mailboxName = app.mailboxName || '';
@@ -144,7 +144,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
             };
 
             // The backend supports multiple alternateDomains, however we only have ui for one
-            if ($scope.appConfigure.alternateDomainEnabled) data.alternateDomains = [{ domain: $scope.appConfigure.alternateDomain, subdomain: $scope.appConfigure.alternateSubdomain }];
+            if ($scope.appConfigure.alternateDomainEnabled) data.alternateDomains = [{ domain: $scope.appConfigure.alternateDomain.domain, subdomain: $scope.appConfigure.alternateSubdomain }];
 
             if ($scope.appConfigure.mailboxName !== $scope.appConfigure.app.mailboxName) data.mailboxName = $scope.appConfigure.mailboxName;