diff --git a/src/views/apps.html b/src/views/apps.html
index 55b055ddc..75b36c412 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -10,7 +10,7 @@
                 <fieldset>
                     <form role="form" name="appConfigureForm" ng-submit="appConfigure.submit()" autocomplete="off">
                         <uib-tabset active="appConfigure.action">
-                            <uib-tab index="'general'" heading="General">
+                            <uib-tab index="'location'" heading="Location">
                                 <br/>
                                 <div class="has-error text-center" ng-show="appConfigure.error.other">{{ appConfigure.error.other }}</div>
                                 <div class="form-group" ng-class="{ 'has-error': (appConfigureForm.location.$dirty && appConfigureForm.location.$invalid) || (!appConfigureForm.location.$dirty && appConfigure.error.location)  }">
@@ -52,6 +52,45 @@
                                     </ng-form>
                                 </div>
 
+                                <div class="form-group alternate-domains" ng-class="{ 'has-error': appConfigure.error.alternateDomains  }">
+                                  <label class="control-label">Redirect the following domains to this app</label>
+                                  <div class="has-error" ng-show="appConfigure.error.alternateDomains">{{ appConfigure.error.alternateDomains }}</div>
+
+                                  <div class="row" ng-repeat="alternateDomain in appConfigure.alternateDomains">
+                                    <div class="col col-lg-11">
+                                      <div class="input-group">
+                                        <input type="text" class="form-control" ng-model="alternateDomain.subdomain" placeholder="Leave empty to use bare domain">
+
+                                        <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 class="caret"></span>
+                                          </button>
+                                          <ul class="dropdown-menu dropdown-menu-right" role="menu">
+                                            <li ng-repeat="domain in domains">
+                                              <a href="" ng-click="alternateDomain.domain = domain">{{ domain.domain }}</a>
+                                            </li>
+                                          </ul>
+                                        </div>
+                                      </div>
+                                    </div>
+                                    <div class="col col-lg-1">
+                                      <button class="btn btn-danger btn-sm" ng-click="appConfigure.delAlternateDomain($event, $index)"><i class="far fa-trash-alt"></i></button>
+                                    </div>
+                                  </div>
+                                  <div class="row">
+                                    <div class="col col-lg-11">
+                                      <p ng-show="appConfigure.alternateDomains.length === 0">No alternate domains are configured</p>
+                                    </div>
+                                    <div class="col col-lg-1">
+                                      <button class="btn btn-primary btn-sm" ng-click="appConfigure.addAlternateDomain($event)"><i class="fas fa-plus"></i></button>
+                                    </div>
+                                  </div>
+                                </div>
+                            </uib-tab>
+
+                            <uib-tab index="'access'" heading="Access">
+                                <br/>
                                 <div class="form-group">
                                     <div ng-show="appConfigure.ssoAuth">
                                         <label class="control-label">User management</label>
@@ -177,42 +216,6 @@
                                     <label class="control-label" for="appConfigureEnableAutomaticUpdate">Enable automatic updates</label>
                                 </div>
 
-                                <div class="form-group alternate-domains" ng-class="{ 'has-error': appConfigure.error.alternateDomains  }">
-                                  <label class="control-label">Redirect the following domains to this app</label>
-                                  <div class="has-error" ng-show="appConfigure.error.alternateDomains">{{ appConfigure.error.alternateDomains }}</div>
-
-                                  <div class="row" ng-repeat="alternateDomain in appConfigure.alternateDomains">
-                                    <div class="col col-lg-11">
-                                      <div class="input-group">
-                                        <input type="text" class="form-control" ng-model="alternateDomain.subdomain" placeholder="Leave empty to use bare domain">
-
-                                        <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 class="caret"></span>
-                                          </button>
-                                          <ul class="dropdown-menu dropdown-menu-right" role="menu">
-                                            <li ng-repeat="domain in domains">
-                                              <a href="" ng-click="alternateDomain.domain = domain">{{ domain.domain }}</a>
-                                            </li>
-                                          </ul>
-                                        </div>
-                                      </div>
-                                    </div>
-                                    <div class="col col-lg-1">
-                                      <button class="btn btn-danger btn-sm" ng-click="appConfigure.delAlternateDomain($event, $index)"><i class="far fa-trash-alt"></i></button>
-                                    </div>
-                                  </div>
-                                  <div class="row">
-                                    <div class="col col-lg-11">
-                                      <p ng-show="appConfigure.alternateDomains.length === 0">No alternate domains are configured</p>
-                                    </div>
-                                    <div class="col col-lg-1">
-                                      <button class="btn btn-primary btn-sm" ng-click="appConfigure.addAlternateDomain($event)"><i class="fas fa-plus"></i></button>
-                                    </div>
-                                  </div>
-                                </div>
-
                                 <div class="hide">
                                     <label class="control-label" for="appConfigureCertificateInput" ng-show="appConfigure.domain.provider !== 'caas'">Certificate (optional)</label>
                                     <div class="has-error text-center" ng-show="appConfigure.error.cert && appConfigure.domain.provider !== 'caas'">{{ appConfigure.error.cert }}</div>
diff --git a/src/views/apps.js b/src/views/apps.js
index e27cedbeb..88faeb8ae 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -51,7 +51,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         label: '',
         icon: { file: null, data: null, url: null },
 
-        action: 'general',
+        action: 'location',
 
         isAccessRestrictionValid: function () {
             var tmp = $scope.appConfigure.accessRestriction;
@@ -218,7 +218,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
                 if (error) {
                     if (error.statusCode === 409 && (error.message.indexOf('Port') !== -1)) {
                         $scope.appConfigure.error.port = error.message;
-                        tab = 'general';
+                        tab = 'location';
                     } else if (error.statusCode === 400 && error.message.indexOf('mailbox') !== -1 ) {
                         $scope.appConfigure.error.mailboxName = error.message;
                         $scope.appConfigureForm.mailboxName.$setPristine();
@@ -226,7 +226,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
                     } else if (error.statusCode === 409 && error.message.indexOf('subdomain') !== -1) {
                         $scope.appConfigure.error.location = error.message;
                         $scope.appConfigureForm.location.$setPristine();
-                        tab = 'general';
+                        tab = 'location';
                         $('#appConfigureLocationInput').focus();
                     } else if (error.statusCode === 400 && error.message.indexOf('cert') !== -1 ) {
                         $scope.appConfigure.error.cert = error.message;
@@ -242,7 +242,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
                         $('#appConfigureDataDirInput').focus();
                     } else {
                         $scope.appConfigure.error.other = error.message;
-                        tab = 'general';
+                        tab = 'location';
                     }
 
                     $scope.appConfigure.action = tab;