Index: branches/unlabeled/unlabeled-1.36.2/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -r8233 -r8235
--- branches/unlabeled/unlabeled-1.36.2/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 8233)
+++ branches/unlabeled/unlabeled-1.36.2/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 8235)
@@ -737,6 +737,13 @@
 			if (isset($vars['admin']) && $vars['admin'] == 1) {
 				// index template doesn't begin recursion on front-end (in admin frame)
 				$vars['m_theme'] = '';
+				
+				if (isset($params['m_opener']) && $params['m_opener'] == 'r') {
+					// front-end link for highlighting purposes
+					$vars['t'] = 'index';
+					$vars['m_cat_id'] = $this->Application->findModule('Name', 'Proj-CMS', 'RootCat');
+				}
+				
 				unset($recursion_templates[ array_search('index', $recursion_templates)]);
 			}
 			
Index: branches/unlabeled/unlabeled-1.57.2/core/kernel/session/session.php
===================================================================
diff -u -r8234 -r8235
--- branches/unlabeled/unlabeled-1.57.2/core/kernel/session/session.php	(.../session.php)	(revision 8234)
+++ branches/unlabeled/unlabeled-1.57.2/core/kernel/session/session.php	(.../session.php)	(revision 8235)
@@ -808,7 +808,7 @@
 		$this->StoreVar('last_env', substr($last_env, strlen(ENV_VAR_NAME)+1));
 		
 		// save last_template in persistant session
-		if (!$wid && ($t != 'login')) {
+		if (!$wid) {
 			if ($this->Application->IsAdmin()) {
 				// only for main window, not popups, not login template (used in adm:MainFrameLink tag)
 				$this->StorePersistentVar('last_template_popup', $last_template);
Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/login.tpl
===================================================================
diff -u -r8233 -r8235
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/login.tpl	(.../login.tpl)	(revision 8233)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/login.tpl	(.../login.tpl)	(revision 8235)
@@ -51,7 +51,8 @@
 		</tr>
 	</table>
 	<input type="hidden" name="next_template" value="<inp2:m_if check="m_GetEquals" name="next_template" value="">index<inp2:m_else/><inp2:m_get var="next_template"/></inp2:m_if>">
-
+	<input type="hidden" name="skip_last_template" value="1"/>
+	
 	<script type="text/javascript">
 		function doLogin()
 		{