diff --git a/rootfs/etc/confd/templates/10-auth.conf.tmpl b/rootfs/etc/confd/templates/10-auth.conf.tmpl
index f76f601..e3b8b0e 100644
--- a/rootfs/etc/confd/templates/10-auth.conf.tmpl
+++ b/rootfs/etc/confd/templates/10-auth.conf.tmpl
@@ -1,6 +1,6 @@
 auth_username_chars = {{getenv "ALLOWED_USERNAME_CHARS" "äöüabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@"}}
 auth_username_format = %n
-auth_mechanisms = {{getenv "AUTH_MECHANISMS" "plain login"}}
+auth_mechanisms = {{getenv "AUTH_MECHANISMS" "plain"}}
 !include auth-oauth2.conf.ext
 auth_verbose = yes
 auth_debug = yes
diff --git a/rootfs/etc/confd/templates/auth-oauth2.conf.ext.tmpl b/rootfs/etc/confd/templates/auth-oauth2.conf.ext.tmpl
index c246682..692de70 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 login 
+  mechanisms = plain
   args = /etc/dovecot/dovecot-oauth2.conf.ext
 }
 
diff --git a/rootfs/etc/confd/templates/dovecot-oauth2.conf.ext.tmpl b/rootfs/etc/confd/templates/dovecot-oauth2.conf.ext.tmpl
index 52350ce..b7c6637 100644
--- a/rootfs/etc/confd/templates/dovecot-oauth2.conf.ext.tmpl
+++ b/rootfs/etc/confd/templates/dovecot-oauth2.conf.ext.tmpl
@@ -10,4 +10,3 @@ tls_ca_cert_file = /etc/ssl/certs/ca-certificates.crt
 use_grant_password = yes
 pass_attrs = host=127.0.0.1 proxy=y proxy_mech=xoauth2 pass=%{oauth2:access_token}
 debug = yes
-rawlog_dir = /tmp/oauth2