diff --git a/roles/mail/templates/dovecot.conf b/roles/mail/templates/dovecot.conf
index c64a9ff..9892248 100644
--- a/roles/mail/templates/dovecot.conf
+++ b/roles/mail/templates/dovecot.conf
@@ -26,9 +26,6 @@ service auth {
   }
 }
 service managesieve-login {
-  executable = /usr/lib/dovecot/managesieve-login
-}
-service managesieve {
   inet_listener sieve {
     port = 4190
   }
@@ -37,6 +34,9 @@ service managesieve {
   vsz_limit = 64 M
   executable = /usr/lib/dovecot/managesieve-login
 }
+service managesieve {
+ executable = /usr/lib/dovecot/managesieve
+}
 userdb {
   args = /etc/dovecot/dovecot-mysql.conf
   driver = sql
diff --git a/roles/mail/templates/root-postfix.sql b/roles/mail/templates/root-postfix.sql
index ff4bafa..24642a4 100644
--- a/roles/mail/templates/root-postfix.sql
+++ b/roles/mail/templates/root-postfix.sql
@@ -1,5 +1,4 @@
 DROP DATABASE IF EXISTS postfix;
-DROP USER 'postfix'@'%';
 CREATE DATABASE postfix;
 GRANT ALL PRIVILEGES ON postfix.* TO 'postfix'@'%' IDENTIFIED BY '{{ dbpassword.stdout }}';
 GRANT SELECT ON postfix.* TO 'postfix'@'%' IDENTIFIED BY '{{ dbpassword.stdout }}';