diff --git a/rootfs/etc/confd/templates/10-auth.conf.tmpl b/rootfs/etc/confd/templates/10-auth.conf.tmpl
index e3d8a9e..2ab4bc0 100644
--- a/rootfs/etc/confd/templates/10-auth.conf.tmpl
+++ b/rootfs/etc/confd/templates/10-auth.conf.tmpl
@@ -1,4 +1,4 @@
 auth_username_chars = {{getenv "ALLOWED_USERNAME_CHARS" "äöüabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@"}}
-auth_username_format = %Lu
-auth_mechanisms = {{getenv "AUTH_MECHANISMS" "plain"}}
+auth_username_format = %n
+auth_mechanisms = {{getenv "AUTH_MECHANISMS" "plain login"}}
 !include auth-oauth2.conf.ext
diff --git a/rootfs/etc/confd/templates/auth-oauth2.conf.ext.tmpl b/rootfs/etc/confd/templates/auth-oauth2.conf.ext.tmpl
index d49a8fa..c246682 100644
--- a/rootfs/etc/confd/templates/auth-oauth2.conf.ext.tmpl
+++ b/rootfs/etc/confd/templates/auth-oauth2.conf.ext.tmpl
@@ -1,6 +1,6 @@
 passdb {
   driver = oauth2
-  mechanisms = plain 
+  mechanisms = plain login 
   args = /etc/dovecot/dovecot-oauth2.conf.ext
 }