Index: trunk/kernel/units/users/users_event_handler.php
===================================================================
diff -u -N -r3145 -r3207
--- trunk/kernel/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 3145)
+++ trunk/kernel/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 3207)
@@ -13,10 +13,16 @@
 			}
 			else
 			{
+				$unset_vars = Array(ENV_VAR_NAME, 'rewrite', 'url', 'Action');
 				$http_query =& $this->Application->recallObject('HTTPQuery');
-				if( isset($http_query->Get[ENV_VAR_NAME]) ) unset($http_query->Get[ENV_VAR_NAME]);
+				$get = $http_query->Get;
+				foreach ($unset_vars as $var_name)
+				{
+					if( isset($get[$var_name]) ) unset( $get[$var_name] );
+				}
+				
 				$t = $this->Application->GetVar('t');
-				$this->Application->Redirect($t ? $t : 'index', $http_query->Get);
+				$this->Application->Redirect($t ? $t : 'index', $get);
 			}
 		}
 
Index: trunk/core/kernel/utility/http_query.php
===================================================================
diff -u -N -r3200 -r3207
--- trunk/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 3200)
+++ trunk/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 3207)
@@ -276,6 +276,14 @@
 		}
 	}
 
+	function finalizeParsing($passed, $module_params = Array() )
+	{
+		if( is_array($passed) ) $passed = implode(',', $passed);
+		$this->Set('passed', $passed);
+		$env = $this->Application->BuildEnv( $this->Get('t'), $module_params, $passed, false, false );
+		$this->Set(ENV_VAR_NAME, $env);
+		$_REQUEST['env'] = $_GET['env'] = $env; // for capability with old in-portal code
+	}
 	
 	function processRewriteURL()
 	{
@@ -301,6 +309,7 @@
 			$this->Application->VerifyThemeId();
 //			 $this->Get('m_lang') );
 			$this->Set('t', $this->getDefaultTemplate('') );
+			$this->finalizeParsing('m');
 			return false;
 		}
 		
@@ -422,10 +431,7 @@
 			$module_params = Array($module_prefix.'_id' => $item_id ? $item_id : '0' );
 		}
 
-		$this->Set('passed', implode(',', $passed) );
-		$env = $this->Application->BuildEnv( $this->Get('t'), $module_params, implode(',', $passed), false, false );
-		$this->Set(ENV_VAR_NAME, $env);
-		$_REQUEST['env'] = $_GET['env'] = $env; // for capability with old in-portal code
+		$this->finalizeParsing($passed, $module_params);
 	}
 	
 	function getDefaultTemplate($t)
Index: trunk/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r3145 -r3207
--- trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 3145)
+++ trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 3207)
@@ -13,10 +13,16 @@
 			}
 			else
 			{
+				$unset_vars = Array(ENV_VAR_NAME, 'rewrite', 'url', 'Action');
 				$http_query =& $this->Application->recallObject('HTTPQuery');
-				if( isset($http_query->Get[ENV_VAR_NAME]) ) unset($http_query->Get[ENV_VAR_NAME]);
+				$get = $http_query->Get;
+				foreach ($unset_vars as $var_name)
+				{
+					if( isset($get[$var_name]) ) unset( $get[$var_name] );
+				}
+				
 				$t = $this->Application->GetVar('t');
-				$this->Application->Redirect($t ? $t : 'index', $http_query->Get);
+				$this->Application->Redirect($t ? $t : 'index', $get);
 			}
 		}