Index: branches/5.2.x/core/units/users/users_tag_processor.php
===================================================================
diff -u -N -r14502 -r14585
--- branches/5.2.x/core/units/users/users_tag_processor.php	(.../users_tag_processor.php)	(revision 14502)
+++ branches/5.2.x/core/units/users/users_tag_processor.php	(.../users_tag_processor.php)	(revision 14585)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_tag_processor.php 14502 2011-08-13 07:12:19Z alex $
+* @version	$Id: users_tag_processor.php 14585 2011-09-24 12:04:17Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -19,7 +19,7 @@
 
 		function LogoutLink($params)
 		{
-			$pass = Array('pass' => 'all,m,u', 'u_event' => 'OnLogout', 'm_cat_id'=>0);
+			$pass = Array('pass' => 'all,m,u', 'u_event' => 'OnLogout', 'm_cat_id' => 0, '__NO_REWRITE__' => 1);
 			$logout_template = $this->SelectParam($params, 'template,t');
 			return $this->Application->HREF($logout_template, '', $pass);
 		}
@@ -312,11 +312,13 @@
 		{
 			$passed_key = trim($this->Application->GetVar('user_key'));
 
-		    $user =& $this->Application->recallObject('u', null, Array('skip_autoload' => true));
-			/* @var $user UsersItem */
+			$user_helper =& $this->Application->recallObject('UserHelper');
+	    	/* @var $user_helper UserHelper */
 
+		    $user =& $user_helper->getUserObject();
 			$user->Load($passed_key, 'PwResetConfirm');
-			if (!$user->isLoaded()) {
+
+			if ( !$user->isLoaded() ) {
 				return ;
 			}
 
@@ -326,10 +328,9 @@
 			$user->SetDBField('PwRequestTime_time', NULL);
 			$user->Update();
 
-			$user_helper =& $this->Application->recallObject('UserHelper');
-	    	/* @var $user_helper UserHelper */
-
-	    	$user_helper->loginUserById( $user->GetID() );
+			if ( $user_helper->checkLoginPermission() ) {
+	    		$user_helper->loginUserById( $user->GetID() );
+			}
 		}
 
 	}
\ No newline at end of file