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);