diff --git a/bin/v-add-mail-account b/bin/v-add-mail-account
index 141c773b..8a16cbfe 100755
--- a/bin/v-add-mail-account
+++ b/bin/v-add-mail-account
@@ -47,7 +47,13 @@ is_mail_new "$account"
 #----------------------------------------------------------#
 #                       Action                             #
 #----------------------------------------------------------#
-md5=$(/usr/sbin/dovecotpw -s md5 -p "$password")
+
+if [ -x '/usr/bin/doveadm' ]; then
+    md5=$(/usr/bin/doveadm pw -s md5 -p "$password")
+else
+    md5=$(/usr/sbin/dovecotpw -s md5 -p "$password")
+fi
+
 str="$account:$md5:$user:mail::$HOMEDIR/$user:$quota"
 echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
 
diff --git a/bin/v-add-mail-domain b/bin/v-add-mail-domain
index 3fbc253d..b8f5666d 100755
--- a/bin/v-add-mail-domain
+++ b/bin/v-add-mail-domain
@@ -48,7 +48,7 @@ mkdir $HOMEDIR/$user/conf/mail/$domain
 touch $HOMEDIR/$user/conf/mail/$domain/aliases
 touch $HOMEDIR/$user/conf/mail/$domain/protection
 touch $HOMEDIR/$user/conf/mail/$domain/passwd
-chown -R root:mail $HOMEDIR/$user/conf/mail/$domain
+chown -R dovecot:mail $HOMEDIR/$user/conf/mail/$domain
 chmod 770 $HOMEDIR/$user/conf/mail/$domain
 chmod 660 $HOMEDIR/$user/conf/mail/$domain/*
 mkdir $HOMEDIR/$user/mail/$domain
diff --git a/bin/v-rebuild-mail-domains b/bin/v-rebuild-mail-domains
index fddd91aa..2771f097 100755
--- a/bin/v-rebuild-mail-domains
+++ b/bin/v-rebuild-mail-domains
@@ -61,8 +61,8 @@ for domain in $(search_objects 'mail' 'SUSPENDED' "*" 'DOMAIN'); do
     touch $HOMEDIR/$user/conf/mail/$domain/aliases
     touch $HOMEDIR/$user/conf/mail/$domain/protection
     touch $HOMEDIR/$user/conf/mail/$domain/passwd
-    chown -R root:mail $HOMEDIR/$user/conf/mail/$domain
-    chown -R root:mail /etc/exim/domains/$domain
+    chown -R dovecot:mail $HOMEDIR/$user/conf/mail/$domain
+    chown -R dovecot:mail /etc/exim/domains/$domain
     chmod 770 $HOMEDIR/$user/conf/mail/$domain
     chmod 660 $HOMEDIR/$user/conf/mail/$domain*
     chmod 660 /etc/exim/domains/$domain