diff --git a/core/nginx/conf/nginx.conf b/core/nginx/conf/nginx.conf
index a7a9e134..81f1ac0d 100644
--- a/core/nginx/conf/nginx.conf
+++ b/core/nginx/conf/nginx.conf
@@ -133,10 +133,12 @@ http {
         {% endif %}
         include /etc/nginx/proxy.conf;
         client_max_body_size {{ MESSAGE_SIZE_LIMIT|int + 8388608 }};
-        auth_request /internal/auth/user;
         proxy_pass http://$webmail;
+      {% if ADMIN == 'true' %}
+        auth_request /internal/auth/user;
         error_page 403 @webmail_login;
       }
+
       location {{ WEB_WEBMAIL }}/sso.php {
         {% if WEB_WEBMAIL != '/' %}
         rewrite ^({{ WEB_WEBMAIL }})$ $1/ permanent;
@@ -152,11 +154,13 @@ http {
         proxy_pass http://$webmail;
         error_page 403 @webmail_login;
       }
+
       location @webmail_login {
         return 302 {{ WEB_ADMIN }}/ui/login?next=ui.webmail;
       }
-      {% endif %}
-
+      {% else %}
+      }
+      {% endif %}{% endif %}
       {% if ADMIN == 'true' %}
       location {{ WEB_ADMIN }} {
         return 301 {{ WEB_ADMIN }}/ui;
diff --git a/webmails/rainloop/application.ini b/webmails/rainloop/application.ini
index bc953af1..0504f174 100644
--- a/webmails/rainloop/application.ini
+++ b/webmails/rainloop/application.ini
@@ -7,9 +7,11 @@ attachment_size_limit = {{ MAX_FILESIZE }}
 allow_admin_panel = Off
 
 [labs]
+allow_gravatar = Off
+{% if ADMIN == "true" %}
 custom_login_link='sso.php'
 custom_logout_link='{{ WEB_ADMIN }}/ui/logout'
-allow_gravatar = Off
+{% endif %}
 
 [contacts]
 enable = On
diff --git a/webmails/roundcube/config.inc.php b/webmails/roundcube/config.inc.php
index bb1a5e84..d8028db3 100644
--- a/webmails/roundcube/config.inc.php
+++ b/webmails/roundcube/config.inc.php
@@ -17,8 +17,7 @@ $config['plugins'] = array(
     'markasjunk',
     'managesieve',
     'enigma',
-    'carddav',
-    'mailu'
+    'carddav'
 );
 
 $front = getenv('FRONT_ADDRESS') ? getenv('FRONT_ADDRESS') : 'front';
@@ -37,8 +36,11 @@ $config['managesieve_host'] = $imap;
 $config['managesieve_usetls'] = false;
 
 // Customization settings
-$config['support_url'] = getenv('WEB_ADMIN') ? '../..' . getenv('WEB_ADMIN') : '';
-$config['sso_logout_url'] = getenv('WEB_ADMIN').'/ui/logout';
+if (filter_var(getenv('ADMIN'), FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE)) {
+	array_push($config['plugins'], 'mailu');
+	$config['support_url'] = getenv('WEB_ADMIN') ? '../..' . getenv('WEB_ADMIN') : '';
+	$config['sso_logout_url'] = getenv('WEB_ADMIN').'/ui/logout';
+}
 $config['product_name'] = 'Mailu Webmail';
 
 // We access the IMAP and SMTP servers locally with internal names, SSL