diff --git a/webadmin/src/views/apps.html b/webadmin/src/views/apps.html
index 6350ad9f9..05ad3458e 100644
--- a/webadmin/src/views/apps.html
+++ b/webadmin/src/views/apps.html
@@ -81,7 +81,14 @@
                             </p>
                         </div>
 
-                        <div class="form-group" ng-hide="appConfigure.app.manifest.singleUser || appConfigure.app.manifest.customAuth">
+                        <div class="form-group" ng-show="appConfigure.app.manifest.addons.email">
+                            <label class="control-label">Access control</label>
+                            <p>
+                                This app authenticates all users using IMAP & SMTP.
+                            </p>
+                        </div>
+
+                        <div class="form-group" ng-hide="appConfigure.app.manifest.singleUser || appConfigure.app.manifest.customAuth || appConfigure.app.manifest.addons.email">
                             <label class="control-label">Access control</label>
                             <div class="radio">
                                 <label>
diff --git a/webadmin/src/views/apps.js b/webadmin/src/views/apps.js
index d00493391..6eb5d7f1c 100644
--- a/webadmin/src/views/apps.js
+++ b/webadmin/src/views/apps.js
@@ -193,7 +193,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         $scope.appConfigure.xFrameOptions = app.xFrameOptions.indexOf('ALLOW-FROM') === 0 ? app.xFrameOptions.split(' ')[1] : '';
 
         var manifest = app.manifest;
-        $scope.appConfigure.needsOAuthProxy = !(manifest.addons['ldap'] || manifest.addons['oauth'] || manifest.addons['simpleauth'] || manifest.customAuth);
+        $scope.appConfigure.needsOAuthProxy = !(manifest.addons['ldap'] || manifest.addons['oauth'] || manifest.addons['simpleauth'] || manifest.addons['email'] || manifest.customAuth);
         if ($scope.appConfigure.needsOAuthProxy && !app.oauthProxy) {
             $scope.appConfigure.accessRestrictionOption = 'unrestricted';
         } else {
diff --git a/webadmin/src/views/appstore.html b/webadmin/src/views/appstore.html
index dea7e5a77..6d1a0546f 100644
--- a/webadmin/src/views/appstore.html
+++ b/webadmin/src/views/appstore.html
@@ -47,7 +47,14 @@
                             </p>
                         </div>
 
-                        <div class="form-group" ng-hide="appInstall.app.manifest.singleUser || appInstall.app.manifest.customAuth">
+                        <div class="form-group" ng-show="appInstall.app.manifest.addons.email">
+                            <label class="control-label">Access control</label>
+                            <p>
+                                This app authenticates all users using IMAP & SMTP.
+                            </p>
+                        </div>
+
+                        <div class="form-group" ng-hide="appInstall.app.manifest.singleUser || appInstall.app.manifest.customAuth || appInstall.app.manifest.addons.email">
                             <label class="control-label">Access control</label>
                             <div class="radio">
                                 <label>
diff --git a/webadmin/src/views/appstore.js b/webadmin/src/views/appstore.js
index e5b23058d..00de45569 100644
--- a/webadmin/src/views/appstore.js
+++ b/webadmin/src/views/appstore.js
@@ -109,7 +109,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
             $scope.appInstall.accessRestrictionSingleUser = null;
 
             var manifest = app.manifest;
-            $scope.appInstall.needsOAuthProxy = !(manifest.addons['ldap'] || manifest.addons['oauth'] || manifest.addons['simpleauth'] || manifest.customAuth);
+            $scope.appInstall.needsOAuthProxy = !(manifest.addons['ldap'] || manifest.addons['oauth'] || manifest.addons['simpleauth'] || manifest.addons['email'] || manifest.customAuth);
             $scope.appInstall.accessRestrictionOption = 'any';
 
             // set default ports