Index: branches/5.1.x/core/units/helpers/user_helper.php
===================================================================
diff -u -N -r14351 -r14478
--- branches/5.1.x/core/units/helpers/user_helper.php	(.../user_helper.php)	(revision 14351)
+++ branches/5.1.x/core/units/helpers/user_helper.php	(.../user_helper.php)	(revision 14478)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: user_helper.php 14351 2011-05-23 08:08:47Z alex $
+* @version	$Id: user_helper.php 14478 2011-08-13 05:24:39Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -233,7 +233,8 @@
 			$this->Application->resetCounters('UserSession');
 			$this->Application->Session->SetCookie('remember_login', '', strtotime('-1 hour'));
 
-			$this->event->SetRedirectParam('pass', 'all');
+			// don't pass user prefix on logout, since resulting url will have broken "env"
+			$this->event->SetRedirectParam('pass', MOD_REWRITE ? 'm' : 'all');
 		}
 
 		/**
Index: branches/5.1.x/core/units/users/users_tag_processor.php
===================================================================
diff -u -N -r14364 -r14478
--- branches/5.1.x/core/units/users/users_tag_processor.php	(.../users_tag_processor.php)	(revision 14364)
+++ branches/5.1.x/core/units/users/users_tag_processor.php	(.../users_tag_processor.php)	(revision 14478)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_tag_processor.php 14364 2011-06-14 12:45:45Z alex $
+* @version	$Id: users_tag_processor.php 14478 2011-08-13 05:24:39Z 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);
 		}