diff --git a/setup/webmail.sh b/setup/webmail.sh
index 3071f4b..94a28f5 100755
--- a/setup/webmail.sh
+++ b/setup/webmail.sh
@@ -211,13 +211,13 @@ sudo -u www-data touch /var/log/roundcubemail/errors.log
 cp ${RCM_PLUGIN_DIR}/password/config.inc.php.dist \
 	${RCM_PLUGIN_DIR}/password/config.inc.php
 
-management/editconf.py ${RCM_PLUGIN_DIR}/password/config.inc.php \
-	"\$config['password_minimum_length']=8;" \
-	"\$config['password_db_dsn']='sqlite:///$STORAGE_ROOT/mail/users.sqlite';" \
-	"\$config['password_query']='UPDATE users SET password=%D WHERE email=%u';" \
-	"\$config['password_dovecotpw']='/usr/bin/doveadm pw';" \
-	"\$config['password_dovecotpw_method']='SHA512-CRYPT';" \
-	"\$config['password_dovecotpw_with_method']=true;"
+management/editconf.py -c "//" ${RCM_PLUGIN_DIR}/password/config.inc.php \
+	"\$config['password_minimum_length'] = 8;" \
+	"\$config['password_db_dsn'] = 'sqlite:///$STORAGE_ROOT/mail/users.sqlite';" \
+	"\$config['password_query'] = 'UPDATE users SET password=%P WHERE email=%u';" \
+	"\$config['password_algorithm'] = 'sha512-crypt';" \
+	"\$config['password_algorithm_prefix'] = '{SHA512-CRYPT}';" \
+	"\$config['password_dovecotpw_with_method'] = false;"
 
 # so PHP can use doveadm, for the password changing plugin
 usermod -a -G dovecot www-data