3 files changed, 6 insertions, 5 deletions
diff --git a/plugins/password/localization/en_US.inc b/plugins/password/localization/en_US.inc
index 9794bf021..9e25214cd 100644
--- a/plugins/password/localization/en_US.inc
+++ b/plugins/password/localization/en_US.inc
@@ -9,8 +9,8 @@ $labels['confpasswd']  = 'Confirm New Password:';
 $messages = array();
 $messages['nopassword'] = 'Please input new password.';
 $messages['nocurpassword'] = 'Please input current password.';
-$messages['passwordincorrectly'] = 'Current password incorrectly.';
-$messages['passwordinconsistency'] = 'Inconsistency of password, please try again.';
+$messages['passwordincorrect'] = 'Current password incorrect.';
+$messages['passwordinconsistency'] = 'Passwords do not match, please try again.';
 $messages['nocryptfunction'] = 'The server is missing a function to encrypt your password - contact your system adminstrator.';
 $messages['internalerror'] = 'The server is updated more than one row in the database. This could be bad for all users. Contact your system adminstrator.';
 $messages['errorsaving'] = 'Could not save your new password to the database. Contact your system adminstrator.';
diff --git a/plugins/password/localization/nl_NL.inc b/plugins/password/localization/nl_NL.inc
index f9ffefcc3..61d4e366d 100644
--- a/plugins/password/localization/nl_NL.inc
+++ b/plugins/password/localization/nl_NL.inc
@@ -9,7 +9,7 @@ $labels['confpasswd']  = 'Bevestig Nieuw Wachtwoord:';
 $messages = array();
 $messages['nopassword'] = 'Vul een wachtwoord in.';
 $messages['nocurpassword'] = 'vul het huidige wachtwoord in.';
-$messages['passwordincorrectly'] = 'Huidig wachtwoord is onjuist.';
+$messages['passwordincorrect'] = 'Huidig wachtwoord is onjuist.';
 $messages['passwordinconsistency'] = 'Wachtwoorden komen niet overeen, probeer het opnieuw.';
 $messages['nocryptfunction'] = 'De server mist een functie om uw wachtwoord et beveiligen - neem contact op met uw systeembeheerder.';
 $messages['internalerror'] = 'De server heeft meer dan 1 regel in de database gewijzigd. Dit kan een probleem opleveren voor alle gebruikers. Neem contact op met uw systeembeheerder.';
diff --git a/plugins/password/password.php b/plugins/password/password.php
index f10c43ca9..75befc0d1 100644
--- a/plugins/password/password.php
+++ b/plugins/password/password.php
@@ -13,7 +13,7 @@
  * Configuration Items (config/main.inc.php):
  *   password_confirm_current - boolean to determine whether current password
  *     is required to change password. Defaults to FALSE.
- *   db_passwd_dsn - is the PEAR database DSN for performing the query. Defaults
+ *   password_db_dsn - is the PEAR database DSN for performing the query. Defaults
  *     to the default databse setting in config/db.inc.php
  *   password_query - the SQL query used to change the password.
  *     If the SQL query is a SELECT it will return an error message in a row if unsuccessful
@@ -208,13 +208,14 @@ class password extends rcube_plugin
     if (!($sql = $cfg->get('password_query')))
       $sql = "SELECT update_passwd(%c, %u)";
 
-    if ($dsn = $cfg->get('db_passwd_dsn')) {
+    if ($dsn = $cfg->get('password_db_dsn')) {
       $db = new rcube_mdb2($dsn, '', FALSE);
       $db->set_debug((bool)$cfg->get('sql_debug'));
       $db->db_connect('w');
     } else {
       $db = rcmail::get_instance()->get_dbh();
     }
+
     if ($err = $db->is_error())
       return $err;