diff --git a/lib/roundcube.sh b/lib/roundcube.sh
index d911e81..65d079d 100644
--- a/lib/roundcube.sh
+++ b/lib/roundcube.sh
@@ -211,7 +211,7 @@ smtpd_sasl_type = dovecot
 smtpd_tls_auth_only = yes
 EOF
 
-#[[ ! -d "/federated/apps/mail/data/etc/dovecot/conf.d" ]] && mkdir /federated/apps/mail/data/etc/dovecot/conf.d
+[[ ! -d "/federated/apps/mail/data/etc/dovecot/conf.d" ]] && mkdir /federated/apps/mail/data/etc/dovecot/conf.d
 cat > /federated/apps/mail/data/etc/dovecot/conf.d/95-roundcube.conf <<'EOF'
 service auth {
   unix_listener /var/spool/postfix/private/auth {
@@ -224,6 +224,17 @@ EOF
 
 [[ ! $(grep 95-roundcube.conf /federated/apps/mail/docker-compose.yml 2>/dev/null) ]] && sed -i "/volumes:/a  \      - ./data/etc/dovecot/conf.d/95-roundcube.conf:/etc/dovecot/conf.d/95-roundcube.conf" /federated/apps/mail/docker-compose.yml
 
+sed -i "s/ENABLE_SASLAUTHD=.*/ENABLE_SASLAUTHD=0/g" /federated/apps/mail/.env
+sed -i "s/SASLAUTHD_MECHANISMS=.*/SASLAUTHD_MECHANISMS=rimap/g" /federated/apps/mail/.env
+sed -i "/SASLAUTHD_MECHANISMS=rimap/a  \SASLAUTHD_MECH_OPTIONS=127.0.0.1" /federated/apps/mail/.env
+sed -i "s/SASLAUTHD_LDAP_SERVER=.*/#SASLAUTHD_LDAP_SERVER=ldap:\/\/ldap.$DOMAIN/g" /federated/apps/mail/.env
+sed -i "s/SASLAUTHD_LDAP_BIND_DN=.*/#SASLAUTHD_LDAP_BIND_DN=cn=admin,dc=$LDAP_DOMAIN_FIRST,dc=$LDAP_DOMAIN_LAST/g" /federated/apps/mail/.env
+sed -i "s/SASLAUTHD_LDAP_PASSWORD=.*/#SASLAUTHD_LDAP_PASSWORD=$LDAP_SECRET/g" /federated/apps/mail/.env
+sed -i "s/SASLAUTHD_LDAP_SEARCH_BASE=.*/#SASLAUTHD_LDAP_SEARCH_BASE=ou=people,dc=$LDAP_DOMAIN_FIRST,dc=$LDAP_DOMAIN_LAST/g" /federated/apps/mail/.env
+sed -i 's/SASLAUTHD_LDAP_FILTER=.*/#SASLAUTHD_LDAP_FILTER=\(\&\(objectClass\=inetOrgPerson\)\(mail\=\%U\@\%r\)\)/g' /federated/apps/mail/.env
+sed -i 's/DOVECOT_PASS_FILTER=.*/DOVECOT_PASS_FILTER=\(\|\(mail\=\%u\)\(uid\=\%u\)\)/g' /federated/apps/mail/.env
+sed -i 's/DOVECOT_USER_FILTER=.*/DOVECOT_USER_FILTER=\(\|\(mail\=\%u\)\(uid\=\%u\)\)/g' /federated/apps/mail/.env
+
   /federated/bin/stop roundcube
   /federated/bin/start roundcube
   /federated/bin/stop mail
diff --git a/lib/wordpress.sh b/lib/wordpress.sh
index 5aeaeed..3edd269 100644
--- a/lib/wordpress.sh
+++ b/lib/wordpress.sh
@@ -239,6 +239,14 @@ EOF
   /federated/bin/stop authelia
   /federated/bin/start authelia
 
+if [[ ! $(grep authelia /federated/apps/wordpress/docker-compose.yml) ]]; then
+  if [[ $(grep extra_hosts /federated/apps/wordpress/docker-compose.yml) ]]; then
+    sed -i "/extra_hosts/a  \      - \"authelia.$DOMAIN:$EXTERNALIP\"" /federated/apps/wordpress/docker-compose.yml
+  else
+    sed -i "/restart: always/a  \    extra_hosts:\n\      - \"authelia.$DOMAIN:$EXTERNALIP\"" /federated/apps/wordpress/docker-compose.yml
+  fi
+fi
+
 sed -i "/Add any custom values/a \
 define( 'OIDC_CLIENT_ID', 'wordpress' );\n\
 define( 'OIDC_CLIENT_SECRET', '$WORDPRESS_CLIENT_SECRET' );\n\