Index: branches/RC/core/units/users/users_event_handler.php
===================================================================
diff -u -r9037 -r9125
--- branches/RC/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 9037)
+++ branches/RC/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 9125)
@@ -864,7 +864,7 @@
 				if (!$confirm_template) {
 					$this->Application->SetVar('reset_confirm_template', 'platform/login/forgotpass_reset');
 				}
-				$this->Application->EmailEventUser('INCOMMERCEUSER.PSWDC', $user_object->GetDBField('PortalUserId'));
+				$this->Application->EmailEventUser('USER.PSWDC', $user_object->GetDBField('PortalUserId'));
 
 				$event->redirect = $this->Application->GetVar('template_success');
 			}
@@ -910,7 +910,7 @@
 
 			if($user_object->Load($this->Application->RecallVar('tmp_user_id'))){
 
-				$this->Application->EmailEventUser('INCOMMERCEUSER.PSWDC', $user_object->GetDBField("PortalUserId"));
+				$this->Application->EmailEventUser('USER.PSWDC', $user_object->GetDBField("PortalUserId"));
 				$event->redirect = $this->Application->GetVar('template_success');
 
 				$m_cat_id = $this->Application->findModule('Name', 'In-Commerce', 'RootCat');
@@ -957,8 +957,8 @@
 
 			      	$this->Application->SetVar('ForgottenPassword', $newpw);
 
-			     	$email_event_user 	=& $this->Application->EmailEventUser('INCOMMERCEUSER.PSWD', $user_object->GetDBField('PortalUserId'));
-			     	$email_event_admin 	=& $this->Application->EmailEventAdmin('INCOMMERCEUSER.PSWD');
+			     	$email_event_user 	=& $this->Application->EmailEventUser('USER.PSWD', $user_object->GetDBField('PortalUserId'));
+			     	$email_event_admin 	=& $this->Application->EmailEventAdmin('USER.PSWD');
 
 			     	$this->Application->DeleteVar('ForgottenPassword');