diff --git a/src/views/appstore.html b/src/views/appstore.html
index 11dbeb527..6730bcb7c 100644
--- a/src/views/appstore.html
+++ b/src/views/appstore.html
@@ -56,18 +56,17 @@
               </ng-form>
             </div>
 
-            <!-- for spaces users, the User management is hidden. thus the admin flag check -->
-            <div class="form-group" ng-show="user.isAtLeastAdmin && appInstall.customAuth && !appInstall.app.manifest.addons.email">
+            <div class="form-group" ng-show="appInstall.customAuth && !appInstall.app.manifest.addons.email">
               <label class="control-label">User management</label>
               <p>This app has it's own user management.</p>
             </div>
 
-            <div class="form-group" ng-show="user.isAtLeastAdmin && appInstall.app.manifest.addons.email">
+            <div class="form-group" ng-show="appInstall.app.manifest.addons.email">
               <label class="control-label">User management</label>
               <p>All users with a mailbox on this Cloudron have access.</p>
             </div>
 
-            <div class="form-group" ng-show="user.isAtLeastAdmin && !appInstall.customAuth && !appInstall.app.manifest.addons.email">
+            <div class="form-group" ng-show="!appInstall.customAuth && !appInstall.app.manifest.addons.email">
               <label class="control-label">User management</label>
               <div class="radio" ng-show="appInstall.optionalSso">
                 <label>
@@ -155,7 +154,7 @@
       <div class="modal-footer">
         <button type="button" class="btn btn-success pull-left" ng-click="openSubscriptionSetup()" ng-show="appInstall.state === 'subscriptionRequired'">Setup Subscription</button>
         <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-        <button type="button" class="btn btn-danger" ng-show="user.isAtLeastAdmin && appInstall.state === 'resourceConstraint'" ng-click="appInstall.showForm(true)">Install anyway</button>
+        <button type="button" class="btn btn-danger" ng-show="appInstall.state === 'resourceConstraint'" ng-click="appInstall.showForm(true)">Install anyway</button>
         <button type="button" class="btn btn-success" ng-show="appInstall.state === 'appInfo'" ng-click="appInstall.showForm()">Install</button>
         <button type="button" class="btn btn-success" ng-show="appInstall.state === 'installForm'" ng-click="appInstall.submit()" ng-disabled="appInstallForm.$invalid || appInstall.busy"><i class="fa fa-circle-notch fa-spin" ng-show="appInstall.busy"></i> Install {{ appInstall.needsOverwrite ? 'and overwrite DNS' : '' }}</button>
       </div>
diff --git a/src/views/appstore.js b/src/views/appstore.js
index faad0f982..b5c3fb9d4 100644
--- a/src/views/appstore.js
+++ b/src/views/appstore.js
@@ -134,16 +134,8 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
             $scope.appInstall.optionalSso = !!manifest.optionalSso;
             $scope.appInstall.customAuth = !(manifest.addons['ldap'] || manifest.addons['oauth']);
 
-            // for spaces users, the User management is hidden. thus the admin flag check
-            if (!$scope.user.isAtLeastAdmin) {
-                // just install it with access restriction as just the user
-                var me = $scope.users.find(function (u) { return u.id === $scope.user.id; });
-                $scope.appInstall.accessRestrictionOption = 'groups';
-                $scope.appInstall.accessRestriction = { users: [ me ], groups: [] };
-            } else {
-                $scope.appInstall.accessRestrictionOption = 'any';
-                $scope.appInstall.accessRestriction = { users: [], groups: [] };
-            }
+            $scope.appInstall.accessRestrictionOption = 'any';
+            $scope.appInstall.accessRestriction = { users: [], groups: [] };
 
             // set default ports
             var allPorts = angular.extend({}, $scope.appInstall.app.manifest.tcpPorts, $scope.appInstall.app.manifest.udpPorts);