diff --git a/src/views/appstore.html b/src/views/appstore.html
index cf597454a..0f34e8dfb 100644
--- a/src/views/appstore.html
+++ b/src/views/appstore.html
@@ -56,12 +56,13 @@
             <div class="form-group" ng-show="appInstall.app.manifest.addons.email">
               <label class="control-label">{{ 'appstore.installDialog.userManagement' | tr }}</label>
               <p>{{ 'appstore.installDialog.userManagementMailbox' | tr }}</p>
+              <p class="text-info" ng-bind-html="'appstore.installDialog.configuredForCloudronEmail' | tr:{ emailDocsLink: 'https://docs.cloudron.io/email/' }"></p>
             </div>
 
-            <div class="form-group" ng-show="!appInstall.app.manifest.addons.email">
+            <div class="form-group">
               <label class="control-label" ng-show="!appInstall.customAuth">{{ 'appstore.installDialog.userManagement' | tr }}</label>
-              <label class="control-label" ng-show="appInstall.customAuth">{{ 'app.accessControl.userManagement.dashboardVisibility' | tr }}</label>
-              <p ng-show="appInstall.customAuth">{{ 'appstore.installDialog.userManagementNone' | tr }}</p>
+              <label class="control-label" ng-show="appInstall.customAuth || appInstall.app.manifest.addons.email">{{ 'app.accessControl.userManagement.dashboardVisibility' | tr }}</label>
+              <p ng-show="appInstall.customAuth && !appInstall.app.manifest.addons.email">{{ 'appstore.installDialog.userManagementNone' | tr }}</p>
 
               <div class="radio" ng-show="appInstall.optionalSso">
                 <label>
@@ -101,8 +102,6 @@
               <br/>
             </div>
 
-            <p ng-show="appInstall.app.manifest.addons.email" class="text-info" ng-bind-html="'appstore.installDialog.configuredForCloudronEmail' | tr:{ emailDocsLink: 'https://docs.cloudron.io/email/' }"></p>
-
             <div class="hide">
               <label class="control-label" for="appInstallCertificateInput">Certificate (optional)</label>
               <div class="has-error text-center" ng-show="appInstall.error.cert">{{ appInstall.error.cert }}</div>