diff --git a/defaults/main.yml b/defaults/main.yml
index c27c008..12c4796 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -18,11 +18,13 @@ mailserver:
       drop_user_agent:
         regex: '^User-Agent:'
         action: IGNORE
+  dovecot:
+    debug: false
   postfixadmin:
     php_fpm_config:
       user: postfixadmin
       group: postfixadmin
-      listen: /run/php/php{{ php_version }}-fpm-postfixadmin.sock
+      listen: '/run/php/php{{ php_version }}-fpm-postfixadmin.sock'
       listen.owner: www-data
       listen.group: www-data
       listen.mode: '0660'
@@ -61,5 +63,7 @@ mailserver:
       forgotten_admin_password_reset: false
       password_expiration: 'NO'
       generate_password: 'YES'
+      password_validation:
+        '/.{8}/': 'password_too_short 8'
       used_quotas: 'YES'
       show_footer_text: 'NO'
diff --git a/templates/dovecot/dovecot.conf.j2 b/templates/dovecot/dovecot.conf.j2
index 53fdbf0..1cf89a0 100644
--- a/templates/dovecot/dovecot.conf.j2
+++ b/templates/dovecot/dovecot.conf.j2
@@ -130,11 +130,6 @@ protocol lda {
   mail_plugins = $mail_plugins sieve
 }
 
-# Debugging
-auth_verbose = yes
-auth_debug = yes
-mail_debug = yes
-
 # Quota
 plugin {
   # Use postfixadmins quota2 table, so used_quota works
@@ -157,3 +152,10 @@ dict {
   # proxy::pgsql
   pgsql = pgsql:/etc/dovecot/dovecot-dict-sql.conf
 }
+
+{% if mailserver.dovecot.debug %}
+# Debugging
+auth_verbose = yes
+auth_debug = yes
+mail_debug = yes
+{% endif %}