diff --git a/js/settings/PasswdPanel.js b/js/settings/PasswdPanel.js
index a9c9f70..6083906 100644
--- a/js/settings/PasswdPanel.js
+++ b/js/settings/PasswdPanel.js
@@ -18,7 +18,7 @@ Zarafa.plugins.passwd.settings.PasswdPanel = Ext.extend(Ext.form.FormPanel, {
 
 		Ext.applyIf(config, {
 			xtype : 'zarafa.passwdpanel',
-			labelWidth : 150,
+			labelWidth : 200,
 			defaults : {
 				width : 200
 			},
@@ -26,11 +26,11 @@ Zarafa.plugins.passwd.settings.PasswdPanel = Ext.extend(Ext.form.FormPanel, {
 			items : [{
 				xtype : 'displayfield',
 				name : 'username',
-				fieldLabel : 'User name'
+				fieldLabel : dgettext("plugin_passwd", 'User name')
 			}, {
 				xtype : 'textfield',
 				name : 'current_password',
-				fieldLabel : 'Current password',
+				fieldLabel : dgettext("plugin_passwd", 'Current password'),
 				inputType : 'password',
 				listeners : {
 					change : this.onFieldChange,
@@ -39,7 +39,7 @@ Zarafa.plugins.passwd.settings.PasswdPanel = Ext.extend(Ext.form.FormPanel, {
 			}, {
 				xtype : 'textfield',
 				name : 'new_password',
-				fieldLabel : 'New password',
+				fieldLabel : dgettext("plugin_passwd", 'New password'),
 				inputType : 'password',
 				listeners : {
 					change : this.onFieldChange,
@@ -48,7 +48,7 @@ Zarafa.plugins.passwd.settings.PasswdPanel = Ext.extend(Ext.form.FormPanel, {
 			}, {
 				xtype : 'textfield',
 				name : 'new_password_repeat',
-				fieldLabel : 'Retype new password',
+				fieldLabel : dgettext("plugin_passwd", 'Retype new password'),
 				inputType : 'password',
 				listeners : {
 					change : this.onFieldChange,
@@ -92,4 +92,4 @@ Zarafa.plugins.passwd.settings.PasswdPanel = Ext.extend(Ext.form.FormPanel, {
 	}
 });
 
-Ext.reg('zarafa.passwdpanel', Zarafa.plugins.passwd.settings.PasswdPanel);
\ No newline at end of file
+Ext.reg('zarafa.passwdpanel', Zarafa.plugins.passwd.settings.PasswdPanel);
diff --git a/language/nl_NL.UTF-8/LC_MESSAGES/plugin_passwd.po b/language/nl_NL.UTF-8/LC_MESSAGES/plugin_passwd.po
index 4128c05..948c1ac 100644
--- a/language/nl_NL.UTF-8/LC_MESSAGES/plugin_passwd.po
+++ b/language/nl_NL.UTF-8/LC_MESSAGES/plugin_passwd.po
@@ -76,3 +76,20 @@ msgstr "Wijzig wachtwoord"
 # js/PasswdPlugin.js:50:
 msgid "Password Change Plugin"
 msgstr "Wachtwoord wijzigen plugin"
+
+# js/settings/PasswdPanel.js:29:
+msgid "User name"
+msgstr "Gebruikersnaam"
+
+# js/settings/PasswdPanel.js:33:
+msgid "Current password"
+msgstr "Huidig wachtwoord"
+
+# js/settings/PasswdPanel.js:42:
+msgid "New password"
+msgstr "Nieuw wachtwoord"
+
+#js/settings/PasswdPanel.js:51:
+msgid "Retype new password"
+msgstr "Herhaal nieuw wachtwoord"
+
diff --git a/php/class.passwdmodule.php b/php/class.passwdmodule.php
index b2ec6b1..b9af00a 100644
--- a/php/class.passwdmodule.php
+++ b/php/class.passwdmodule.php
@@ -57,7 +57,7 @@ class PasswdModule extends Module
 		}
 
 		if($data['new_password'] !== $data['new_password_repeat']) {
-			$errorMessage = dgettext("plugin_passwd", 'New passwords does not match.');
+			$errorMessage = dgettext("plugin_passwd", 'New passwords do not match.');
 		}
 
 		if(empty($errorMessage)) {