diff --git a/src/views/app.html b/src/views/app.html
index 6ede6e887..6d26c2a7d 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -622,14 +622,21 @@
           <div class="col-md-12">
             <form role="form" name="accessForm" ng-submit="access.submit()" autocomplete="off">
               <div class="form-group">
-                <div ng-show="access.ssoAuth">
+
+                <div class="form-group" ng-show="app.manifest.addons.email">
+                  <label class="control-label">{{ 'app.accessControl.userManagement.title' | tr }}</label>
+                  <p>{{ 'appstore.installDialog.userManagementMailbox' | tr }}
+                    <span ng-bind-html="'appstore.installDialog.configuredForCloudronEmail' | tr:{ emailDocsLink: 'https://docs.cloudron.io/email/' }">
+                  </p>
+                </div>
+
+                <div ng-show="access.ssoAuth && !app.manifest.addons.email">
                   <label class="control-label">{{ 'app.accessControl.userManagement.title' | tr }}  <sup><a ng-href="https://docs.cloudron.io/apps/#access-restriction" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
                   <p>{{ 'app.accessControl.userManagement.description' | tr }} <span class="text-small text-warning" ng-show="access.ftp">{{ 'app.accessControl.userManagement.descriptionSftp' | tr }}</span></p>
                 </div>
-                <div ng-show="!access.ssoAuth">
+                <div ng-show="!access.ssoAuth || app.manifest.addons.email">
                   <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>
-                  <p ng-show="!app.manifest.addons.email" class="text-small">{{ 'appstore.installDialog.userManagementNone' | tr }} <span ng-show="access.ftp">{{ 'app.accessControl.userManagement.sftpAccessControl' | tr }}</span></p>
-                  <p ng-show="app.manifest.addons.email" class="text-small" ng-bind-html="'appstore.installDialog.configuredForCloudronEmail' | tr:{ emailDocsLink: 'https://docs.cloudron.io/email/' }"></p>
+                  <p ng-show="!app.manifest.addons.email">{{ 'appstore.installDialog.userManagementNone' | tr }} <span ng-show="access.ftp">{{ 'app.accessControl.userManagement.sftpAccessControl' | tr }}</span></p>
                 </div>
 
                 <div class="radio">