Index: branches/RC/core/units/general/helpers/permissions_helper.php
===================================================================
diff -u -N -r11823 -r11865
--- branches/RC/core/units/general/helpers/permissions_helper.php	(.../permissions_helper.php)	(revision 11823)
+++ branches/RC/core/units/general/helpers/permissions_helper.php	(.../permissions_helper.php)	(revision 11865)
@@ -426,16 +426,14 @@
 				$t = $next_t;
 			}
 
-			$redirect_params = $this->Application->HttpQuery->getRedirectParams();
-			$redirect_params['lang_mode'] = '';
-			$redirect_params['m_wid'] = '';
+			$redirect_params = $this->Application->HttpQuery->getRedirectParams(true);
 
 			if (array_key_exists('pass_category', $params)) {
 				$redirect_params['pass_category'] = $params['pass_cateogry'];
 			}
 
 			if (!$this->Application->LoggedIn()) {
-				$redirect_template = $params['login_template'];
+				$redirect_template = array_key_exists('login_template', $params) ? $params['login_template'] : '';
 				if (!$redirect_template && $this->Application->IsAdmin()) {
 					$redirect_template = 'login';
 				}