diff --git a/dashboard/public/translation/en.json b/dashboard/public/translation/en.json
index cad089f41..c6e26b0cb 100644
--- a/dashboard/public/translation/en.json
+++ b/dashboard/public/translation/en.json
@@ -80,7 +80,7 @@
             "locationPlaceholder": "Leave empty to use bare domain",
             "manualWarning": "Manually set up A (IPv4) and AAAA (IPv6) DNS records for <b>{{ location }}</b> pointing to this server",
             "userManagement": "User management",
-            "userManagementNone": "This app has its own user management. Configure whether this app is visible in the user’s dashboard.",
+            "userManagementNone": "This app has its own user management.",
             "userManagementMailbox": "Users with a <a href=\"/#/mailboxes\">mailbox</a> can log in with their mailbox email and Cloudron password.",
             "userManagementLeaveToApp": "Leave user management to the app",
             "userManagementAllUsers": "Allow all users on this Cloudron",
@@ -1165,7 +1165,7 @@
         },
         "accessControl": {
             "userManagement": {
-                "description": "Configure the app to authenticate with the Cloudron user directory. This setting controls who can log in and use the app.",
+                "description": "Configure who can log in and use the app.",
                 "descriptionSftp": "This setting also controls SFTP access.",
                 "dashboardVisibility": "Dashboard visibility",
                 "visibleForAllUsers": "Visible to all users on this Cloudron",
@@ -1180,6 +1180,9 @@
             "operators": {
                 "title": "Operators",
                 "description": "Operators can configure and maintain this app."
+            },
+            "dashboardVisibility": {
+                "description": "Configure who can see this app on the dashboard."
             }
         },
         "resources": {
diff --git a/dashboard/src/components/AccessControl.vue b/dashboard/src/components/AccessControl.vue
index 9f86129a0..86a844192 100644
--- a/dashboard/src/components/AccessControl.vue
+++ b/dashboard/src/components/AccessControl.vue
@@ -42,20 +42,18 @@ const cloudronAuth = computed(() => {
 
 <template>
   <div>
-    <FormGroup v-show="manifest.addons.email">
-      <label>{{ $t('appstore.installDialog.userManagement') }}</label>
-      <div>
-        {{ $t('appstore.installDialog.userManagementMailbox') }}
-        <span v-html="$t('appstore.installDialog.configuredForCloudronEmail', { emailDocsLink: 'https://docs.cloudron.io/email/' })"></span>
-      </div>
+    <FormGroup>
+      <label>{{ $t('appstore.installDialog.userManagement') }} <sup v-if="!manifest.addons.email"><a href="https://docs.cloudron.io/apps/#access-restriction" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+      <div v-if="cloudronAuth && !manifest.addons.email">{{ $t('app.accessControl.userManagement.description') }}</div>
+      <div v-if="!cloudronAuth && !manifest.addons.email">{{ $t('appstore.installDialog.userManagementNone') }}</div>
+      <div v-if="manifest.addons.email" v-html="$t('appstore.installDialog.userManagementMailbox')"></div>
     </FormGroup>
 
-    <FormGroup>
-      <label v-show="cloudronAuth && !manifest.addons.email">{{ $t('appstore.installDialog.userManagement') }} <sup><a href="https://docs.cloudron.io/apps/#access-restriction" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
-      <div v-show="cloudronAuth && !manifest.addons.email">{{ $t('app.accessControl.userManagement.description') }}</div>
+    <br/>
 
-      <label v-show="!cloudronAuth || manifest.addons.email">{{ $t('app.accessControl.userManagement.dashboardVisibility') }} <sup><a href="https://docs.cloudron.io/apps/#dashboard-visibility" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
-      <div v-show="!cloudronAuth || manifest.addons.email">{{ $t('appstore.installDialog.userManagementNone') }}</div>
+    <FormGroup>
+      <label v-if="!cloudronAuth || manifest.addons.email">{{ $t('app.accessControl.userManagement.dashboardVisibility') }} <sup><a href="https://docs.cloudron.io/apps/#dashboard-visibility" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+      <div v-if="!cloudronAuth || manifest.addons.email">{{ $t('app.accessControl.dashboardVisibility.description') }}</div>
 
       <div style="padding-top: 10px">
         <Radiobutton v-model="accessRestrictionOption" :value="ACL_OPTIONS.NOSSO" v-if="cloudronAuth && optionalSso" :label="$t('appstore.installDialog.userManagementLeaveToApp')"/>