Index: branches/5.2.x/core/units/helpers/user_helper.php
===================================================================
diff -u -N -r15176 -r15374
--- branches/5.2.x/core/units/helpers/user_helper.php	(.../user_helper.php)	(revision 15176)
+++ branches/5.2.x/core/units/helpers/user_helper.php	(.../user_helper.php)	(revision 15374)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: user_helper.php 15176 2012-03-12 11:39:04Z alex $
+* @version	$Id: user_helper.php 15374 2012-05-30 15:27:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -397,11 +397,38 @@
 				}
 			}
 
+			// set language for Admin Console & Front-End with disabled Mod-Rewrite
 			$this->event->SetRedirectParam('m_lang', $language_id); // data
 			$this->Application->Session->SetField('Language', $language_id); // interface
+
+			// set language for Front-End with enabled Mod-Rewrite
+			if ( MOD_REWRITE ) {
+				$this->_injectLanguageIntoUrl($language_id);
+			}
 		}
 
 		/**
+		 * Inject language into whatever page user wants to go after login
+		 *
+		 * @param int $language_id
+		 * @return void
+		 * @access protected
+		 */
+		protected function _injectLanguageIntoUrl($language_id)
+		{
+			$url = $this->Application->HREF($this->event->redirect, '', $this->event->getRedirectParams(), $this->event->redirectScript);
+			$vars = $this->Application->parseRewriteUrl($url, 'pass');
+
+			$vars['pass'] = implode(',', $vars['pass']);
+			$vars['m_lang'] = $language_id;
+			$template = $vars['t'];
+			unset($vars['is_virtual'], $vars['t']);
+
+			$this->event->redirect = $template;
+			$this->event->setRedirectParams($vars, false);
+		}
+
+		/**
 		 * Checks that user is allowed to use super admin mode
 		 *
 		 * @return bool