diff --git a/src/views/appstore.html b/src/views/appstore.html
index 02b6561b4..f5da869a9 100644
--- a/src/views/appstore.html
+++ b/src/views/appstore.html
@@ -124,7 +124,7 @@
               </div>
             </div>
 
-            <input class="ng-hide" type="submit" ng-disabled="(appInstall.accessRestrictionOption === 'groups' && !appInstall.isAccessRestrictionValid()) || appInstallForm.$invalid || busy"/>
+            <input class="ng-hide" type="submit" ng-disabled="(appInstall.accessRestrictionOption === 'groups' && !appInstall.isAccessRestrictionValid()) || !appInstall.accessRestrictionOption || appInstallForm.$invalid || busy"/>
           </form>
         </div>
         <div class="collapse" id="collapseMediaLinksCarousel" data-toggle="false">
@@ -150,7 +150,7 @@
         <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.close' | tr }}</button>
         <button type="button" class="btn btn-danger" ng-show="appInstall.state === 'resourceConstraint'" ng-click="appInstall.showForm(true)">{{ 'appstore.installDialog.installAnywayAction' | tr }}</button>
         <button type="button" class="btn btn-success" ng-show="appInstall.state === 'appInfo'" ng-click="appInstall.showForm()">{{ 'appstore.installDialog.installAction' | tr }}</button>
-        <button type="button" class="btn btn-success" ng-show="appInstall.state === 'installForm'" ng-click="appInstall.submit()" ng-disabled="(appInstall.accessRestrictionOption === 'groups' && !appInstall.isAccessRestrictionValid()) || appInstallForm.$invalid || appInstall.busy"><i class="fa fa-circle-notch fa-spin" ng-show="appInstall.busy"></i> {{ 'appstore.installDialog.doInstallAction' | tr:{ dnsOverwrite: appInstall.needsOverwrite } }}</button>
+        <button type="button" class="btn btn-success" ng-show="appInstall.state === 'installForm'" ng-click="appInstall.submit()" ng-disabled="(appInstall.accessRestrictionOption === 'groups' && !appInstall.isAccessRestrictionValid()) || !appInstall.accessRestrictionOption || appInstallForm.$invalid || appInstall.busy"><i class="fa fa-circle-notch fa-spin" ng-show="appInstall.busy"></i> {{ 'appstore.installDialog.doInstallAction' | tr:{ dnsOverwrite: appInstall.needsOverwrite } }}</button>
       </div>
     </div>
   </div>
diff --git a/src/views/appstore.js b/src/views/appstore.js
index e9d13e789..2fbe83db2 100644
--- a/src/views/appstore.js
+++ b/src/views/appstore.js
@@ -101,7 +101,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$tran
         certificateFileName: '',
         keyFile: null,
         keyFileName: '',
-        accessRestrictionOption: 'any',
+        accessRestrictionOption: '',
         accessRestriction: { users: [], groups: [] },
         customAuth: false,
         optionalSso: false,
@@ -125,7 +125,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$tran
             $scope.appInstall.certificateFileName = '';
             $scope.appInstall.keyFile = null;
             $scope.appInstall.keyFileName = '';
-            $scope.appInstall.accessRestrictionOption = 'any';
+            $scope.appInstall.accessRestrictionOption = '';
             $scope.appInstall.accessRestriction = { users: [], groups: [] };
             $scope.appInstall.optionalSso = false;
             $scope.appInstall.customAuth = false;
@@ -186,7 +186,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$tran
             $scope.appInstall.optionalSso = !!manifest.optionalSso;
             $scope.appInstall.customAuth = !(manifest.addons['ldap'] || manifest.addons['proxyAuth']);
 
-            $scope.appInstall.accessRestrictionOption = 'any';
+            $scope.appInstall.accessRestrictionOption = $scope.groups.length ? '' : 'any'; // make the user select an ACL conciously if groups are used
             $scope.appInstall.accessRestriction = { users: [], groups: [] };
 
             // set default ports