Index: core/admin_templates/catalog/advanced_view.tpl
===================================================================
--- core/admin_templates/catalog/advanced_view.tpl	(revision 12940)
+++ core/admin_templates/catalog/advanced_view.tpl	(working copy)
@@ -29,7 +29,7 @@
 					menuMgr.timeout = 500;
 					menuMgr.flowOverFormElement = true;
 
-	  			Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
+	  			Request.progressText = '<inp2:m_phrase name="la_title_Loading" no_editing="1" escape="1"/>';
 
 	  			Catalog.prototype.AfterInit = function() {
 	  				this.switchTab();
Index: core/admin_templates/catalog/catalog.tpl
===================================================================
--- core/admin_templates/catalog/catalog.tpl	(revision 12940)
+++ core/admin_templates/catalog/catalog.tpl	(working copy)
@@ -31,7 +31,7 @@
 				menuMgr.timeout = 500;
 				menuMgr.flowOverFormElement = true;
 
-	  			Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
+	  			Request.progressText = '<inp2:m_phrase name="la_title_Loading" no_editing="1" escape="1"/>';
 	  			var $is_catalog = true;
 	  			var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" m_cat_id="#CATEGORY_ID#" no_amp="1"/>', 'catalog_', 'Catalog');
 				$Catalog.TabByCategory = <inp2:m_if check="m_GetConfig" name="Catalog_PreselectModuleTab">true<inp2:m_else/>false</inp2:m_if>;
Index: core/admin_templates/catalog/item_selector/item_selector_toolbar.tpl
===================================================================
--- core/admin_templates/catalog/item_selector/item_selector_toolbar.tpl	(revision 12940)
+++ core/admin_templates/catalog/item_selector/item_selector_toolbar.tpl	(working copy)
@@ -8,7 +8,7 @@
 	menuMgr.timeout = 500;
 	menuMgr.flowOverFormElement = true;
 
-	Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
+	Request.progressText = '<inp2:m_phrase name="la_title_Loading" no_editing="1" escape="1"/>';
 	var a_toolbar = new ToolBar();
 
 	a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
Index: core/admin_templates/catalog_tab.tpl
===================================================================
--- core/admin_templates/catalog_tab.tpl	(revision 12940)
+++ core/admin_templates/catalog_tab.tpl	(working copy)
@@ -55,17 +55,17 @@
 			<inp2:m_if check="m_Get" name="type" equals_to="item_selector">
 				<a href="javascript:$Catalog.go_to_cat(<inp2:m_get name="c_id"/>, '<inp2:GetModulePrefix/>');" title="<inp2:m_Phrase name='la_alt_GoInside' html_escape='1'/>"><inp2:Field field="$field" grid="$grid" format="$format"/></a>
 			<inp2:m_else/>
-				<a href="<inp2:ItemEditLink/>" title="<inp2:m_Phrase name='la_Text_Edit'/>" onclick="return direct_edit('<inp2:m_param name="PrefixSpecial"/>', this.href);"><inp2:Field field="$field" grid="$grid" format="$format"/></a>
+				<a href="<inp2:ItemEditLink/>" title="<inp2:m_Phrase name='la_Text_Edit' no_editing='1'/>" onclick="return direct_edit('<inp2:m_param name="PrefixSpecial"/>', this.href);"><inp2:Field field="$field" grid="$grid" format="$format"/></a>
 			</inp2:m_if>
 
 			<!--##<span class="small-statistics">(<inp2:SubCatCount/> / <inp2:ItemCount/>)</span>##-->
 
 			<inp2:m_if check="BrowseModeAvailable" pass_params="1">
-				<a href="<inp2:PageBrowseLink/>" title="<inp2:m_Phrase name='la_alt_Browse' html_escape='1'/>"><img src="<inp2:m_TemplatesBase/>/img/ic_browse_mode.gif" width="8" height="7" alt="<inp2:m_Phrase name='la_alt_Browse' html_escape='1'/>" border="0"/></a>
+				<a href="<inp2:PageBrowseLink/>" title="<inp2:m_Phrase name='la_alt_Browse' no_editing='1'/>"><img src="<inp2:m_TemplatesBase/>/img/ic_browse_mode.gif" width="8" height="7" alt="<inp2:m_Phrase name='la_alt_Browse' html_escape='1'/>" border="0"/></a>
 			</inp2:m_if>
 
 			<inp2:m_if check="Field" field="IsSystem" db="db">
-				<span class="field-required" title="<inp2:m_Phrase name='la_System'/>">&nbsp;*</span>
+				<span class="field-required" title="<inp2:m_Phrase name='la_System' no_editing='1'/>">&nbsp;*</span>
 			</inp2:m_if>
 		</inp2:m_DefineElement>
 
Index: core/admin_templates/categories/categories_edit_permissions.tpl
===================================================================
--- core/admin_templates/categories/categories_edit_permissions.tpl	(revision 12940)
+++ core/admin_templates/categories/categories_edit_permissions.tpl	(working copy)
@@ -14,7 +14,7 @@
   		<script type="text/javascript" src="js/ajax.js"></script>
 	  	<script type="text/javascript" src="js/catalog.js"></script>
   		<script type="text/javascript">
-  				Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
+  				Request.progressText = '<inp2:m_phrase name="la_title_Loading" no_editing="1" escape="1"/>';
 
 				Catalog.prototype.AfterInit = function () {
 					Grids['g'].SelectFirst();
Index: core/admin_templates/incs/form_blocks.tpl
===================================================================
--- core/admin_templates/incs/form_blocks.tpl	(revision 12940)
+++ core/admin_templates/incs/form_blocks.tpl	(working copy)
@@ -597,23 +597,23 @@
 
 				         	<script type="text/javascript">
 								function CategorySelector() {
-								} 
+								}
 
 								CategorySelector.getField = function ($field) {
 									return jq('<inp2:{$prefix}_InputName field="#FIELD_NAME#"/>'.replace('#FIELD_NAME#', $field));
 								}
-								
+
 								CategorySelector.disableCategory = function ($field) {
 									var $field_id = this.getField($field);
-					         		
+
 					         		$('#' + $field_id).val('');
 					         		$('#' + $field_id + '_path, #' + $field_id + '_disable_link').hide();
 								}
-					         	
+
 				         		$(document).ready(
 									function() {
 										var $field_id = CategorySelector.getField('<inp2:m_Param name="field" js_escape="1"/>');
-										
+
 										$('#' + $field_id + '_disable_link').click(
 											function ($e) {
 												CategorySelector.disableCategory('<inp2:m_Param name="field" js_escape="1"/>');
@@ -1050,7 +1050,7 @@
 						<inp2:m_phrase name="la_fld_Language"/>:
 						<select name="language" onchange="submit_event('<inp2:m_param name='prefix'/>', 'OnPreSaveAndChangeLanguage');">
 							<inp2:m_DefineElement name="lang_elem">
-								<option value="<inp2:Field name='LanguageId'/>" <inp2:m_if check="SelectedLanguage">selected="selected"</inp2:m_if> ><inp2:Field name="LocalName" no_special='no_special' /></option>
+								<option value="<inp2:Field name='LanguageId'/>" <inp2:m_if check="SelectedLanguage" type="data">selected="selected"</inp2:m_if> ><inp2:Field name="LocalName" no_special='no_special' /></option>
 							</inp2:m_DefineElement>
 							<inp2:lang_PrintList render_as="lang_elem"/>
 						</select>
Index: core/admin_templates/login.tpl
===================================================================
--- core/admin_templates/login.tpl	(revision 12940)
+++ core/admin_templates/login.tpl	(working copy)
@@ -149,7 +149,7 @@
 		          			</tr>
 		          			<tr>
 		          				<td colspan="2" align="center" style="padding: 5px 15px 10px 15px;">
-		              				<input type="submit" name="login_button" value="<inp2:m_phrase name="la_Login"/>" class="kx-login-button roundbutton"></td>
+		              				<input type="submit" name="login_button" value="<inp2:m_phrase name='la_Login' no_editing='1'/>" class="kx-login-button roundbutton"></td>
 		          			</tr>
 						</table>
 					<inp2:m_else/>
Index: core/admin_templates/reviews/reviews.tpl
===================================================================
--- core/admin_templates/reviews/reviews.tpl	(revision 12940)
+++ core/admin_templates/reviews/reviews.tpl	(working copy)
@@ -21,7 +21,7 @@
 					menuMgr.timeout = 500;
 					menuMgr.flowOverFormElement = true;
 
-	  			Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
+	  			Request.progressText = '<inp2:m_phrase name="la_title_Loading" no_editing="1" escape="1"/>';
 
 	  			Catalog.prototype.AfterInit = function() {
 	  				this.switchTab();
Index: core/admin_templates/users/user_edit_items.tpl
===================================================================
--- core/admin_templates/users/user_edit_items.tpl	(revision 12940)
+++ core/admin_templates/users/user_edit_items.tpl	(working copy)
@@ -21,7 +21,7 @@
 					menuMgr.timeout = 500;
 					menuMgr.flowOverFormElement = true;
 
-  				Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
+  				Request.progressText = '<inp2:m_phrase name="la_title_Loading" no_editing="1" escape="1"/>';
 
   				Catalog.prototype.AfterInit = function () {
 					this.switchTab(); // refresh current item tab
Index: core/install/install_schema.sql
===================================================================
--- core/install/install_schema.sql	(revision 12940)
+++ core/install/install_schema.sql	(working copy)
@@ -250,6 +250,7 @@
   PwResetConfirm varchar(255) DEFAULT NULL,
   PwRequestTime int(11) unsigned DEFAULT NULL,
   MinPwResetDelay int(11) NOT NULL DEFAULT '1800',
+  AdminLanguage int(11) DEFAULT NULL,
   PRIMARY KEY (PortalUserId),
   UNIQUE KEY ResourceId (ResourceId),
   UNIQUE KEY Login (Login),
@@ -257,7 +258,8 @@
   KEY `Status` (`Status`),
   KEY Modified (Modified),
   KEY dob (dob),
-  KEY IsBanned (IsBanned)
+  KEY IsBanned (IsBanned),
+  KEY AdminLanguage (AdminLanguage)
 );
 
 CREATE TABLE PortalUserCustomData (
Index: core/install/upgrades.sql
===================================================================
--- core/install/upgrades.sql	(revision 12940)
+++ core/install/upgrades.sql	(working copy)
@@ -1612,4 +1612,8 @@
 UPDATE Phrase SET Phrase = 'lu_btn_SendPassword' WHERE Phrase = 'LU_BTN_SENDPASSWORD';
 
 ALTER TABLE Category DROP IsIndex;
-DELETE FROM Phrase WHERE Phrase IN ('la_CategoryIndex', 'la_Container', 'la_fld_IsIndex');
\ No newline at end of file
+DELETE FROM Phrase WHERE Phrase IN ('la_CategoryIndex', 'la_Container', 'la_fld_IsIndex');
+
+ALTER TABLE PortalUser
+	ADD AdminLanguage INT(11) NULL DEFAULT NULL,
+	ADD INDEX (AdminLanguage);
Index: core/kernel/application.php
===================================================================
--- core/kernel/application.php	(revision 12940)
+++ core/kernel/application.php	(working copy)
@@ -569,22 +569,30 @@
 		return $path;
 	}
 
-	function GetDefaultLanguageId()
+	function GetDefaultLanguageId($init = false)
 	{
-		static $language_id = 0;
+		static $language_info = null;
 
-		if ($language_id > 0) {
-			return $language_id;
+		if (!isset($language_info)) {
+			// cache primary language info first
+			$table = $this->getUnitOption('lang', 'TableName');
+			$id_field = $this->getUnitOption('lang', 'IDField');
+
+			$sql = 'SELECT ' . $id_field . ', IF(AdminInterfaceLang, "Admin", "Front") AS LanguageKey
+					FROM ' . $table . '
+					WHERE (AdminInterfaceLang = 1 OR PrimaryLang = 1) AND (Enabled = 1)';
+			$language_info = $this->Conn->GetCol($sql, 'LanguageKey');
 		}
 
-		$table = $this->getUnitOption('lang', 'TableName');
-		$id_field = $this->getUnitOption('lang', 'IDField');
+		$language_key = ($this->isAdmin && $init) || count($language_info) == 1 ? 'Admin' : 'Front';
 
-		$sql = 'SELECT '.$id_field.'
-				FROM '.$table.'
-				WHERE (PrimaryLang = 1) AND (Enabled = 1)';
-		$language_id = $this->Conn->GetOne($sql);
+		if (array_key_exists($language_key, $language_info) && $language_info[$language_key] > 0) {
+			// get from cache
+			return $language_info[$language_key];
+		}
 
+		$language_id = $language_info && array_key_exists($language_key, $language_info) ? $language_info[$language_key] : false;
+
 		if (!$language_id && defined('IS_INSTALL') && IS_INSTALL) {
 			$language_id = 1;
 		}
Index: core/kernel/languages/phrases_cache.php
===================================================================
--- core/kernel/languages/phrases_cache.php	(revision 12940)
+++ core/kernel/languages/phrases_cache.php	(working copy)
@@ -116,12 +116,7 @@
 		}
 		else {
 			if ($this->Application->isAdmin) {
-				$id_field = $this->Application->getUnitOption('lang', 'IDField');
-				$table_name = $this->Application->getUnitOption('lang', 'TableName');
-				$sql = 'SELECT '.$id_field.'
-						FROM '.$table_name.'
-						WHERE AdminInterfaceLang = 1';
-				$this->LanguageId = $this->Conn->GetOne($sql);
+				$this->LanguageId = $this->Application->Session->GetField('Language');
 			}
 			else {
 				$this->LanguageId = $this->Application->GetVar('m_lang');
@@ -256,7 +251,7 @@
 
 	function LoadPhraseByLabel($label, $original_label, $allow_editing = true, $use_admin = false)
 	{
-		if (!$allow_editing && !array_key_exists($label, $this->_missingPhrases) && array_key_exists($label, $this->Phrases)) {
+		if (!$allow_editing && !$use_admin && !array_key_exists($label, $this->_missingPhrases) && array_key_exists($label, $this->Phrases)) {
 			// label is aready translated, but it's version without on the fly translation code is requested
 			$this->Phrases['NE:' . $label] = $this->Phrases[$label];
 
Index: core/kernel/nparser/nparser.php
===================================================================
--- core/kernel/nparser/nparser.php	(revision 12940)
+++ core/kernel/nparser/nparser.php	(working copy)
@@ -70,8 +70,8 @@
 		parent::kBase();
 
 		if (defined('EDITING_MODE') && (EDITING_MODE == EDITING_MODE_DESIGN)) {
-			$this->_btnPhrases['design'] = $this->Application->Phrase('la_btn_EditDesign', false);
-			$this->_btnPhrases['block'] = $this->Application->Phrase('la_btn_EditBlock', false);
+			$this->_btnPhrases['design'] = $this->Application->Phrase('la_btn_EditDesign', false, true);
+			$this->_btnPhrases['block'] = $this->Application->Phrase('la_btn_EditBlock', false, true);
 		}
 	}
 
Index: core/kernel/session/inp_session.php
===================================================================
--- core/kernel/session/inp_session.php	(revision 12940)
+++ core/kernel/session/inp_session.php	(working copy)
@@ -115,7 +115,7 @@
 	{
 		$fields_hash = Array (
 			'PortalUserId'	=>	$this->Application->isAdmin ? 0 : -2, // Guest
-			'Language'		=>	$this->Application->GetDefaultLanguageId(),
+			'Language'		=>	$this->Application->GetDefaultLanguageId(true),
 			'Theme'			=>	$this->Application->GetDefaultThemeId(),
 			'IpAddress'		=>	$_SERVER['REMOTE_ADDR'], // getenv('REMOTE_ADDR') won't work on IIS, so use $_SERVER instead
 			'GroupId'		=>	$this->Application->ConfigValue('User_GuestGroup'),
Index: core/units/languages/languages_event_handler.php
===================================================================
--- core/units/languages/languages_event_handler.php	(revision 12940)
+++ core/units/languages/languages_event_handler.php	(working copy)
@@ -236,23 +236,40 @@
 			$object->SetDBField('CopyFromLanguage', $primary_lang_id);
 		}
 
-
 		function OnChangeLanguage(&$event)
 		{
-			$this->Application->SetVar('m_lang', $this->Application->GetVar('language'));
+			$language_id = $this->Application->GetVar('language');
 
 			if ($this->Application->isAdmin) {
+				// set new language for this session
+				$this->Application->Session->SetField('Language', $language_id);
+
+				// remember last user language in administrative console
+				if ($this->Application->RecallVar('user_id') == -1) {
+					$this->Application->StorePersistentVar('AdminLanguage', $language_id);
+				}
+				else {
+					$object =& $this->Application->recallObject('u.current');
+					/* @var $object kDBItem */
+
+					$object->SetDBField('AdminLanguage', $language_id);
+					$object->Update();
+				}
+
 				// without this language change in admin will cause erase of last remembered tree section
 				$this->Application->SetVar('skip_last_template', 1);
 			}
-			elseif (MOD_REWRITE) {
-				$mod_rewrite_helper =& $this->Application->recallObject('ModRewriteHelper');
-				/* @var $mod_rewrite_helper kModRewriteHelper */
+			else {
+				// changing language on Front-End
+				$this->Application->SetVar('m_lang', $language_id);
 
-				$mod_rewrite_helper->removePages();
+				if (MOD_REWRITE) {
+					$mod_rewrite_helper =& $this->Application->recallObject('ModRewriteHelper');
+					/* @var $mod_rewrite_helper kModRewriteHelper */
+
+					$mod_rewrite_helper->removePages();
+				}
 			}
-
-			//$this->Application->LinkVar('language', 'm_lang');
 		}
 
 		/**
Index: core/units/languages/languages_tag_processor.php
===================================================================
--- core/units/languages/languages_tag_processor.php	(revision 12940)
+++ core/units/languages/languages_tag_processor.php	(working copy)
@@ -84,7 +84,14 @@
 		function SelectedLanguage($params)
 		{
 			$object =& $this->getObject($params);
-			return $object->GetDBField('LanguageId') == $this->Application->GetVar('m_lang');
+			/* @var $object kDBList */
+
+			if (array_key_exists('type', $params) && $params['type'] == 'data') {
+				// when using language selector on editing forms
+				return $object->GetDBField('LanguageId') == $this->Application->GetVar('m_lang');
+			}
+
+			return $object->GetDBField('LanguageId') == $this->Application->Phrases->LanguageId;
 		}
 
 		/**
Index: core/units/users/users_config.php
===================================================================
--- core/units/users/users_config.php	(revision 12940)
+++ core/units/users/users_config.php	(working copy)
@@ -390,6 +390,11 @@
 							        'PwResetConfirm' => Array('type' => 'string','default' => null),
 							        'PwRequestTime' => Array('type' => 'int','default' => null),
 							        'MinPwResetDelay' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(300 => '5', 600 => '10', 900 => '15', 1800 => '30', 3600 => '60'), 'use_phrases' => 0, 'not_null' => '1',  'default' => 1800),
+									'AdminLanguage' => Array (
+										'type' => 'int',
+										'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Language ORDER BY PackName', 'option_key_field' => 'LanguageId', 'option_title_field' => 'LocalName',
+										'default' => NULL
+									),
 							    ),
 
 					'VirtualFields'	=> 	Array(
Index: core/units/users/users_event_handler.php
===================================================================
--- core/units/users/users_event_handler.php	(revision 12940)
+++ core/units/users/users_event_handler.php	(working copy)
@@ -255,6 +255,7 @@
 
 					$this->Application->HandleEvent($dummy, 'session-log:OnStartSession');
 					$this->processLoginRedirect($event, $password);
+					$this->_processInterfaceLanguage($event);
 					return true;
 				}
 				else {
@@ -325,6 +326,7 @@
 
 					if (!$remember_login_cookie) {
 						$this->processLoginRedirect($event, $password);
+						$this->_processInterfaceLanguage($event);
 					}
 				}
 				else {
@@ -343,6 +345,46 @@
 		}
 
 		/**
+		 * Sets correct interface language after sucessful login, based on user settings
+		 *
+		 * @param kEvent $event
+		 */
+		function _processInterfaceLanguage(&$event)
+		{
+			if (($event->status != erSUCCESS) || !$this->Application->isAdmin) {
+				return ;
+			}
+
+			$is_root = $this->Application->RecallVar('user_id') == -1;
+
+			$object =& $this->Application->recallObject('u.current');
+			/* @var $object kDBItem */
+
+			$user_language_id = $is_root ? $this->Application->RecallPersistentVar('AdminLanguage') : $object->GetDBField('AdminLanguage');
+
+			$sql = 'SELECT LanguageId, IF(LanguageId = ' . (int)$user_language_id . ', 2, AdminInterfaceLang) AS SortKey
+					FROM ' . TABLE_PREFIX . 'Language
+					WHERE Enabled = 1
+					HAVING SortKey <> 0
+					ORDER BY SortKey DESC';
+			$language_info = $this->Conn->GetRow($sql);
+			$language_id = $language_info && $language_info['LanguageId'] ? $language_info['LanguageId'] : $user_language_id;
+
+			if ($user_language_id != $language_id) {
+				// first admin login OR language was delelted or disabled
+				if ($is_root) {
+					$this->Application->StorePersistentVar('AdminLanguage', $language_id);
+				}
+				else {
+					$object->SetDBField('AdminLanguage', $language_id);
+					$object->Update();
+				}
+			}
+
+			$this->Application->Session->SetField('Language', $language_id);
+		}
+
+		/**
 		 * [HOOK] Auto-Logins Front-End user when "Remember Login" cookie is found
 		 *
 		 * @param kEvent $event