diff --git a/ansible/roles/ispmail-dovecot/templates/dovecot-sql.conf.ext.j2 b/ansible/roles/ispmail-dovecot/templates/dovecot-sql.conf.ext.j2
index 423a5e4..6aec2cc 100644
--- a/ansible/roles/ispmail-dovecot/templates/dovecot-sql.conf.ext.j2
+++ b/ansible/roles/ispmail-dovecot/templates/dovecot-sql.conf.ext.j2
@@ -144,5 +144,5 @@
 #iterate_query = SELECT username AS user FROM users
 
 driver = mysql
-connect = host=127.0.0.1 dbname=mailserver user=mailserver password = {{ispmail_mysql_mailserver_password}}
+connect = host=127.0.0.1 dbname=mailserver user=mailserver password={{ispmail_mysql_mailserver_password}}
 password_query = SELECT email as user, password FROM virtual_users WHERE email='%u';
diff --git a/ansible/roles/ispmail-webmail-apache-roundcube/templates/plugins/password/config.inc.php.j2 b/ansible/roles/ispmail-webmail-apache-roundcube/templates/plugins/password/config.inc.php.j2
index 8e31c1c..ddb5370 100644
--- a/ansible/roles/ispmail-webmail-apache-roundcube/templates/plugins/password/config.inc.php.j2
+++ b/ansible/roles/ispmail-webmail-apache-roundcube/templates/plugins/password/config.inc.php.j2
@@ -7,7 +7,7 @@ $config['password_minimum_length'] = 12;
 $config['password_force_save'] = true;
 $config['password_algorithm'] = 'dovecot';
 $config['password_dovecotpw'] = '/usr/bin/doveadm pw -s BLF-CRYPT';
-$config['password_dovecotpw_method'] = 'BLF_CRYPT';
+$config['password_dovecotpw_method'] = 'BLF-CRYPT';
 $config['password_dovecotpw_with_method'] = true;
-$config['password_db_dsn'] = 'mysql://mailadmin:{{ispmail_mysql_mailserver_password}}@localhost/mailserver';
+$config['password_db_dsn'] = 'mysql://mailadmin:{{ispmail_mysql_mailadmin_password}}@localhost/mailserver';
 $config['password_query'] = "UPDATE virtual_users SET password=%D WHERE email=%u";