Index: branches/RC/core/units/general/cat_tag_processor.php
===================================================================
diff -u -r9159 -r9175
--- branches/RC/core/units/general/cat_tag_processor.php	(.../cat_tag_processor.php)	(revision 9159)
+++ branches/RC/core/units/general/cat_tag_processor.php	(.../cat_tag_processor.php)	(revision 9175)
@@ -46,7 +46,9 @@
 		 */
 		function ItemLink($params, $id_prefix = null)
 		{
-			$params = array_merge($params,  Array('pass' => 'm,'.$this->Prefix) );
+			if (!isset($params['pass'])) {
+				$params['pass'] = 'm,'.$this->Prefix;
+			}
 
 			$item_id = isset($params[$id_prefix.'_id']) && $params[$id_prefix.'_id'];
 			if (!$item_id) {
@@ -311,15 +313,11 @@
 		function FavoriteToggleLink($params)
 		{
 			$fav_prefix = $this->Prefix.'-fav';
-			
-			if (!$params['m_cat_id']) {
-				$object =& $this->getObject($params);
-				$params['m_cat_id'] = $object->GetDBField('CategoryId');
-			}
-			$params['pass_category'] = 1;
+
 			$params['pass'] = implode(',', Array('m', $this->Prefix, $fav_prefix));
 			$params[$fav_prefix.'_event'] = 'OnFavoriteToggle';
-			return $this->Application->ProcessParsedTag('m', 'Link', $params);
+
+			return $this->ItemLink($params);
 		}
 
 		/**
Index: branches/RC/core/units/users/users_event_handler.php
===================================================================
diff -u -r9160 -r9175
--- branches/RC/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 9160)
+++ branches/RC/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 9175)
@@ -862,7 +862,7 @@
 
 				$confirm_template = $this->Application->GetVar('reset_confirm_template');
 				if (!$confirm_template) {
-					$this->Application->SetVar('reset_confirm_template', 'platform/login/forgot_password_reset');
+					$this->Application->SetVar('reset_confirm_template', 'platform/login/forgotpass_reset');
 				}
 				$this->Application->EmailEventUser('USER.PSWDC', $user_object->GetDBField('PortalUserId'));