Index: branches/5.2.x/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r14502 -r14503
--- branches/5.2.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 14502)
+++ branches/5.2.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 14503)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_event_handler.php 14502 2011-08-13 07:12:19Z alex $
+* @version	$Id: users_event_handler.php 14503 2011-08-13 07:37:28Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -855,11 +855,11 @@
 			}
 			else {
 				if ( strlen($username) ) {
-					$object->SetError('ForgotLogin', $allow_reset ? 'unknown_username' : 'reset_denied');
+					$object->SetError('ForgotLogin', $found ? 'reset_denied' : 'unknown_username');
 				}
 
 				if ( strlen($email) ) {
-					$object->SetError('ForgotEmail', $allow_reset ? 'unknown_email' : 'reset_denied');
+					$object->SetError('ForgotEmail', $found ? 'reset_denied' : 'unknown_email');
 				}
 			}
 
@@ -1014,11 +1014,6 @@
 		 */
 		function getPassedID(&$event)
 		{
-			if ( preg_match('/^(login|register|recommend|subscribe|forgot)/', $event->Special) ) {
-				// this way we can have 2+ objects stating with same special, e.g. "u.login-sidebox" and "u.login-main"
-				return USER_GUEST;
-			}
-
 			switch ($event->Special) {
 				case 'ord':
 					$order =& $this->Application->recallObject('ord');
@@ -1050,6 +1045,11 @@
 					break;
 			}
 
+			if ( preg_match('/^(login|register|recommend|subscribe|forgot)/', $event->Special) ) {
+				// this way we can have 2+ objects stating with same special, e.g. "u.login-sidebox" and "u.login-main"
+				return USER_GUEST;
+			}
+
 			return parent::getPassedID($event);
 		}