diff --git a/rootfs/etc/confd/templates/auth-oauth2.conf.ext.tmpl b/rootfs/etc/confd/templates/auth-oauth2.conf.ext.tmpl
index 01da1a3..f8392e2 100644
--- a/rootfs/etc/confd/templates/auth-oauth2.conf.ext.tmpl
+++ b/rootfs/etc/confd/templates/auth-oauth2.conf.ext.tmpl
@@ -2,17 +2,15 @@ passdb {
   driver = oauth2
   mechanisms = oauthbearer xoauth2
   args = /etc/dovecot/dovecot-oauth2.token.conf.ext
-  skip = never
 }
 
 passdb {
   driver = oauth2
   mechanisms = plain login
   args = /etc/dovecot/dovecot-oauth2.plain.conf.ext
-  skip = never
 }
 
 userdb {
   driver = static
-  args = uid=vmail gid=vmail home=/var/lib/vmail/mail/%n
+  args = uid=vmail gid=vmail username_format=%n home=/var/lib/vmail/mail/%n
 }