Index: branches/unlabeled/unlabeled-1.78.2/kernel/frontaction.php
===================================================================
diff -u -r7944 -r7954
--- branches/unlabeled/unlabeled-1.78.2/kernel/frontaction.php	(.../frontaction.php)	(revision 7944)
+++ branches/unlabeled/unlabeled-1.78.2/kernel/frontaction.php	(.../frontaction.php)	(revision 7954)
@@ -102,6 +102,7 @@
 	      		$objSession->SetVariable('codevalidationresult', 'lu_resetpw_confirm_text');
 		    	$newpw = makepassword();
 		      	SetVar('user_password', $newpw);
+		      	$application->SetVar('user_password', $newpw);
 		      	$u->Set("Password",$newpw);
 		      	$u->Set("PassResetTime", adodb_mktime());
 		      	$u->Set("PwResetConfirm", '');
Index: branches/unlabeled/unlabeled-1.36.2/kernel/include/portaluser.php
===================================================================
diff -u -r5273 -r7954
--- branches/unlabeled/unlabeled-1.36.2/kernel/include/portaluser.php	(.../portaluser.php)	(revision 5273)
+++ branches/unlabeled/unlabeled-1.36.2/kernel/include/portaluser.php	(.../portaluser.php)	(revision 7954)
@@ -757,8 +757,42 @@
 				return "Undefined:$tagname";
 			break;
         }
-    }    
+    }
+    
+     /**
+     * Sends EmailEvent to user
+     *
+     * @param string $EventName email event name
+     * @param mixed $ToUserId recipient's user_id or email address
+     * @param int $LangId language_id (not in use)
+     * @param string $RecptName recipient's name (only when ID not passed)
+     * @return kEvent
+     */
+    function SendUserEventMail($EventName,$ToUserId,$LangId=NULL,$RecptName=NULL)
+    {
+    	$object =& $this->Application->recallObject('u', null, Array ('skip_autoload' => true));
+    	/* @var $object kDBItem */
+    	
+    	$object->Load($this->UniqueId());
+    	
+    	$send_params = is_numeric($ToUserId) ? Array() : Array ('to_email' => $ToUserId, 'to_name' => $RecptName);
+    	$status = $this->Application->EmailEventUser($EventName, $ToUserId, $send_params);
+		$object->Load($this->Application->RecallVar('user_id'));    	
+    	return $status;
+    }
 
+    function SendAdminEventMail($EventName,$LangId=NULL)
+    {
+		$object =& $this->Application->recallObject('u', null, Array ('skip_autoload' => true));
+    	/* @var $object kDBItem */
+    	
+    	$object->Load($this->UniqueId());
+    	
+    	$status = $this->Application->EmailEventAdmin($EventName);
+    	$object->Load($this->Application->RecallVar('user_id'));
+    	return $status;
+    }   
+
 } /* class clsPortalUser*/
 
 
Index: branches/unlabeled/unlabeled-1.90.2/kernel/include/parseditem.php
===================================================================
diff -u -r7750 -r7954
--- branches/unlabeled/unlabeled-1.90.2/kernel/include/parseditem.php	(.../parseditem.php)	(revision 7750)
+++ branches/unlabeled/unlabeled-1.90.2/kernel/include/parseditem.php	(.../parseditem.php)	(revision 7954)
@@ -623,7 +623,7 @@
 
     function SendAdminEventMail($EventName,$LangId=NULL)
     {
-		return $this->Application->EmailEventAdmin($EventName);
+    	return $this->Application->EmailEventAdmin($EventName);
     }
 
     function parse_template($t)