diff -ur -N e-smith-base+ldap-4.19.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts /home/smebuilder/mezzannine/e-smith-base/work/e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts
--- e-smith-base+ldap-4.19.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts	2008-08-07 21:41:01.000000000 +0200
+++ /home/smebuilder/mezzannine/e-smith-base/work/e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts	2008-08-07 21:42:02.000000000 +0200
@@ -163,10 +163,6 @@
         <trans>Enter the new password in the fields below</trans>
     </entry>
     <entry>
-        <base>RESET_PASSWORD_TITLE</base>
-        <trans>Reset user password</trans>
-    </entry>
-    <entry>
         <base>ERR_OCCURRED_MODIFYING_PASSWORD</base>
         <trans>An error occurred while updating the password</trans>
     </entry>
diff -ur -N e-smith-base+ldap-4.19.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/panels/password/cgi-bin/userpassword /home/smebuilder/mezzannine/e-smith-base/work/e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/panels/password/cgi-bin/userpassword
--- e-smith-base+ldap-4.19.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/panels/password/cgi-bin/userpassword	2008-08-07 21:41:01.000000000 +0200
+++ /home/smebuilder/mezzannine/e-smith-base/work/e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/panels/password/cgi-bin/userpassword	2008-08-07 21:42:02.000000000 +0200
@@ -16,6 +16,4 @@
       </trans>
     </entry>
 
-    <entry>
-
 </lexicon>
diff -ur -N e-smith-base+ldap-4.19.1/root/etc/e-smith/web/functions/useraccounts /home/smebuilder/mezzannine/e-smith-base/work/e-smith-base-4.18.1/root/etc/e-smith/web/functions/useraccounts
--- e-smith-base+ldap-4.19.1/root/etc/e-smith/web/functions/useraccounts	2008-08-07 21:41:01.000000000 +0200
+++ /home/smebuilder/mezzannine/e-smith-base/work/e-smith-base-4.18.1/root/etc/e-smith/web/functions/useraccounts	2008-08-07 21:42:02.000000000 +0200
@@ -257,7 +257,7 @@
     <page name="CheckMaxUsersUnlock" post-event="checkMaxUsers('ResetPassword')">
     </page>
     <page name="ResetPassword" pre-event="turn_off_buttons()" post-event="reset_password()">
-        <title>PASSWORD_RESET_TITLE</title>
+        <title>RESET_PASSWORD_TITLE</title>
         <subroutine src="print_page_description('reset')" />
         <field type="password" id="password1" validation="nonblank, check_password">
             <label>PASSWORD_NEW</label>
diff -ur -N e-smith-base+ldap-4.19.1/root/etc/e-smith/web/panels/password/cgi-bin/userpassword /home/smebuilder/mezzannine/e-smith-base/work/e-smith-base-4.18.1/root/etc/e-smith/web/panels/password/cgi-bin/userpassword
--- e-smith-base+ldap-4.19.1/root/etc/e-smith/web/panels/password/cgi-bin/userpassword	2008-08-07 21:41:01.000000000 +0200
+++ /home/smebuilder/mezzannine/e-smith-base/work/e-smith-base-4.18.1/root/etc/e-smith/web/panels/password/cgi-bin/userpassword	2008-08-07 21:42:02.000000000 +0200
@@ -103,7 +103,7 @@
 	my $pass1 = $fm->{cgi}->param('pass');
     	unless ($pass1 eq $pass2) {
     		$fm->{cgi}->param( -name => 'wherenext', -value => 'Password' );
-       	 	return "PASSWORD_NO_MATCH";
+       	 	return "PASSWORD_VERIFY_ERROR";
     	}
         return "OK";
 }
diff -ur -N e-smith-base+ldap-4.19.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm /home/smebuilder/mezzannine/e-smith-base/work/e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm
--- e-smith-base+ldap-4.19.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm	2008-08-07 21:41:01.000000000 +0200
+++ /home/smebuilder/mezzannine/e-smith-base/work/e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm	2008-08-07 21:42:02.000000000 +0200
@@ -605,7 +605,7 @@
     my $pass1 = $self->{cgi}->param('password1');
     unless ($pass1 eq $pass2) {
         $self->{cgi}->param( -name => 'wherenext', -value => 'Password' );
-        return "PASSWORD_NO_MATCH";
+        return "PASSWORD_VERIFY_ERROR";
     }
     return "OK";
 }
@@ -1140,7 +1140,7 @@
     my $pass1 = $self->{cgi}->param('pass');
     unless ($pass1 eq $pass2) {
         $self->{cgi}->param( -name => 'wherenext', -value => 'Password' );
-        return "SYSTEM_PASSWORD_NO_MATCH";
+        return "SYSTEM_PASSWORD_VERIFY_ERROR";
     }
     return "OK";
 }