diff --git a/bin/v-change-mail-account-password b/bin/v-change-mail-account-password
index 412a6f2b..ec071057 100755
--- a/bin/v-change-mail-account-password
+++ b/bin/v-change-mail-account-password
@@ -46,7 +46,13 @@ is_object_unsuspended "mail/$domain" 'ACCOUNT' "$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
+
 sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd
 str="$account:$md5:$user:mail::$HOMEDIR/$user:$quota"
 echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd