Index: users_event_handler.php
===================================================================
--- users_event_handler.php	(revision 12762)
+++ users_event_handler.php	(working copy)
@@ -1100,7 +1100,9 @@
 
 			    	$this->Application->StoreVar('password', $newpw);
 
-			      	$user_object->SetDBField('Password', $newpw);
+			      	$user_object->SetField('Password', $newpw);
+			      	$user_object->SetField('VerifyPassword', $newpw);
+
 			      	$user_object->SetDBField('PassResetTime', adodb_mktime());
 			      	$user_object->SetDBField('PwResetConfirm', '');
 			      	$user_object->SetDBField('PwRequestTime', 0);
@@ -1117,9 +1119,6 @@
 						$event->redirect_params = array('opener' => 's', 'pass' => 'all');
 						$event->redirect = $this->Application->GetVar('template_success');
 					}
-
-			        $user_object->SetDBField('Password', md5($newpw));
-			        $user_object->Update();
 		      	} else {
 		      		$user_current_object->SetError('PwResetConfirm', 'code_expired', 'lu_code_expired');
 		      		$event->redirect = false;