Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_list.tpl
===================================================================
diff -u -r7099 -r7405
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_list.tpl	(.../admins_list.tpl)	(revision 7099)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_list.tpl	(.../admins_list.tpl)	(revision 7405)
@@ -2,7 +2,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_ParseBlock name="section_header" prefix="u" icon="icon46_users" module="proj-base" title="la_title_UsersManagement"/>
 
-<inp2:m_ParseBlock name="blue_bar" prefix="u" title_preset="admins_list" icon="icon46_users" module="proj-base"/>
+<inp2:m_ParseBlock name="blue_bar" prefix="u" u.admins[grid]="Admins" title_preset="admins_list" icon="icon46_users" module="proj-base"/>
 
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -13,19 +13,22 @@
 	  			//do not rename - this function is used in default grid for double click!
 	  			function edit()
 	  			{
-	  				std_edit_item('u', 'proj-base/users/admins_edit');
+	  				set_hidden_field('remove_specials[u.admins]', 1);
+	  				std_edit_item('u.admins', 'proj-base/users/admins_edit');
 	  			}
 
 	  			var a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('proj-base:new_user', '<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 						function() {
-							std_precreate_item('u', 'proj-base/users/admins_edit')
+							set_hidden_field('remove_specials[u.admins]', 1);
+							std_precreate_item('u.admins', 'proj-base/users/admins_edit')
 						} ) );
 
 				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Edit" escape="1"/>', edit) );
 				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
 						function() {
-							std_delete_items('u')
+							set_hidden_field('remove_specials[u.admins]', 1);
+							std_delete_items('u.admins')
 						} ) );
 
 
@@ -40,13 +43,13 @@
 				a_toolbar.Render();
 			</script>
 		</td>
-		<inp2:m_RenderElement name="search_main_toolbar" prefix="u" grid="Admins"/>
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="u.admins" grid="Admins"/>
 	</tr>
 </tbody>
 </table>
 
-<inp2:m_ParseBlock name="grid" PrefixSpecial="u" IdField="PortalUserId" grid="Admins" menu_filters="yes" grid_filters="1"/>
+<inp2:m_ParseBlock name="grid" PrefixSpecial="u.admins" IdField="PortalUserId" grid="Admins" menu_filters="yes" grid_filters="1"/>
 <script type="text/javascript">
-	Grids['u'].SetDependantToolbarButtons( new Array('edit','delete') );
+	Grids['u.admins'].SetDependantToolbarButtons( new Array('edit','delete') );
 </script>
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.18.4/core/kernel/parser/template.php
===================================================================
diff -u -r7072 -r7405
--- branches/unlabeled/unlabeled-1.18.4/core/kernel/parser/template.php	(.../template.php)	(revision 7072)
+++ branches/unlabeled/unlabeled-1.18.4/core/kernel/parser/template.php	(.../template.php)	(revision 7405)
@@ -95,7 +95,7 @@
 	 */
 	function GetTemplatePaths($filename)
 	{
-		if (isset($this->Application->ReplacementTemplates[$filename])) {
+		if ($this->Application->IsAdmin() && isset($this->Application->ReplacementTemplates[$filename])) {
 			$filename = $this->Application->ReplacementTemplates[$filename];
 		}
 
Index: branches/unlabeled/unlabeled-1.7.2/core/units/languages/languages_tag_processor.php
===================================================================
diff -u -r6908 -r7405
--- branches/unlabeled/unlabeled-1.7.2/core/units/languages/languages_tag_processor.php	(.../languages_tag_processor.php)	(revision 6908)
+++ branches/unlabeled/unlabeled-1.7.2/core/units/languages/languages_tag_processor.php	(.../languages_tag_processor.php)	(revision 7405)
@@ -33,7 +33,7 @@
 
 		function SelectedLanguage($params)
 		{
-			$object =& $this->Application->recallObject($this->getPrefixSpecial());
+			$object =& $this->getObject($params);
 			return $object->GetDBField('LanguageId') == $this->Application->GetVar('m_lang');
 		}