diff --git a/src/js/client.js b/src/js/client.js
index 2a6dc889d..840382b40 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -1859,8 +1859,8 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
                 applink.installationState = ISTATES.INSTALLED;
                 applink.runState = RSTATES.RUNNING;
                 applink.health = HSTATES.HEALTHY;
-                applink.accessLevel = 'operator';
                 applink.iconUrl = that.apiOrigin + '/api/v1/applinks/' + applink.id + '/icon?access_token=' + token + '&ts=' + applink.ts;
+                applink.accessLevel = that._userInfo.isAtLeastAdmin ? 'admin' : 'user';
             });
 
             callback(null, data.applinks);
diff --git a/src/views/apps.html b/src/views/apps.html
index 6f63c1f91..0ec99bb74 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -90,6 +90,8 @@
             <tag-input class="form-control" placeholder="{{ 'app.display.tagsPlaceholder' | tr }}" taglist="applinksEdit.tags" name="tags" uib-tooltip="{{ 'app.display.tagsTooltip' | tr }}"></tag-input>
           </div>
 
+          <label class="control-label">{{ 'app.accessControl.userManagement.dashboardVisibility' | tr }} <sup><a ng-href="https://docs.cloudron.io/apps/#dashboard-visibility" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+
           <div class="radio">
             <label>
               <input type="radio" ng-model="applinksEdit.accessRestrictionOption" value="any">
@@ -104,12 +106,12 @@
             </label>
           </div>
           <div>
-            <div style="margin-left: 20px;">
-              <div class="display: inline-block">
+            <div style="margin-left: 20px; display: flex;">
+              <div>
                 {{ 'appstore.installDialog.users' | tr }}: <multiselect name="accessUsersSelect" class="input-sm stretch" ng-model="applinksEdit.accessRestriction.users" ng-disabled="applinksEdit.accessRestrictionOption !== 'groups'" options="(user.username || user.email)  for user in allUsers" data-multiple="true" filter-after-rows="5" scroll-after-rows="10"></multiselect>
               </div>
 
-              <div class="">
+              <div>
                 {{ 'appstore.installDialog.groups' | tr }}: <multiselect name="accessGroupsSelect" class="input-sm stretch" ng-model="applinksEdit.accessRestriction.groups" ng-disabled="applinksEdit.accessRestrictionOption !== 'groups'" options="group.name for group in allGroups" data-multiple="true" filter-after-rows="5" scroll-after-rows="10"></multiselect>
               </div>
             </div>
diff --git a/src/views/apps.js b/src/views/apps.js
index 23b85f1ac..9716731ac 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -177,11 +177,11 @@ angular.module('Application').controller('AppsController', ['$scope', '$translat
             if (applink.accessRestriction) {
                 userSet = {};
                 applink.accessRestriction.users.forEach(function (uid) { userSet[uid] = true; });
-                $scope.allUsers.forEach(function (u) { if (userSet[u.id] === true) $scope.applink.accessRestriction.users.push(u); });
+                $scope.allUsers.forEach(function (u) { if (userSet[u.id] === true) $scope.applinksEdit.accessRestriction.users.push(u); });
 
                 groupSet = {};
                 if (applink.accessRestriction.groups) applink.accessRestriction.groups.forEach(function (gid) { groupSet[gid] = true; });
-                $scope.allGroups.forEach(function (g) { if (groupSet[g.id] === true) $scope.applink.accessRestriction.groups.push(g); });
+                $scope.allGroups.forEach(function (g) { if (groupSet[g.id] === true) $scope.applinksEdit.accessRestriction.groups.push(g); });
             }
 
             // translate for tag-input