diff --git a/conf/.env.production.sample b/conf/.env.production.sample
index d2f4b91..d27bf87 100644
--- a/conf/.env.production.sample
+++ b/conf/.env.production.sample
@@ -178,7 +178,11 @@ LDAP_BASE=ou=users,dc=yunohost,dc=org
 LDAP_BIND_DN=uid=local,ou=users,dc=yunohost,dc=org
 LDAP_PASSWORD=
 LDAP_UID=uid
-LDAP_SEARCH_FILTER="%{uid}=%{email}"
+LDAP_MAIL=mail
+LDAP_SEARCH_FILTER=(|(%{uid}=%{email})(%{mail}=%{email}))
+LDAP_UID_CONVERSION_ENABLED=true
+LDAP_UID_CONVERSION_SEARCH=., -
+LDAP_UID_CONVERSION_REPLACE=_
 LDAP_TLS_NO_VERIFY=true
 
 # PAM authentication (optional)