Index: branches/RC/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -N -r10098 -r10448
--- branches/RC/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 10098)
+++ branches/RC/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 10448)
@@ -743,7 +743,7 @@
 		function MainFrameLink($params)
 		{
 			$persistent = isset($params['persistent']) && $params['persistent'];
-			if ($persistent) {
+			if ($persistent && $this->Application->ConfigValue('RememberLastAdminTemplate')) {
 				// check last_template in persistent session
 				$last_template = $this->Application->RecallPersistentVar('last_template_popup');
 			}
Index: branches/RC/core/install/upgrades.sql
===================================================================
diff -u -N -r10422 -r10448
--- branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 10422)
+++ branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 10448)
@@ -246,4 +246,5 @@
 ALTER TABLE Category CHANGE `Status` `Status` TINYINT(4) NOT NULL DEFAULT '2';
 
 # ===== v 4.3.1 =====
-
+INSERT INTO ConfigurationAdmin VALUES ('RememberLastAdminTemplate', 'la_Text_General', 'la_config_RememberLastAdminTemplate', 'checkbox', '', '', 10.13, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'RememberLastAdminTemplate', '', 'In-Portal:Users', 'in-portal:configure_users');
Index: branches/RC/core/install/install_data.sql
===================================================================
diff -u -N -r10447 -r10448
--- branches/RC/core/install/install_data.sql	(.../install_data.sql)	(revision 10447)
+++ branches/RC/core/install/install_data.sql	(.../install_data.sql)	(revision 10448)
@@ -81,7 +81,7 @@
 INSERT INTO ConfigurationAdmin VALUES ('UsePageHitCounter', 'la_Text_Website', 'la_config_UsePageHitCounter', 'checkbox', '', '', 10.24, 0, 0);
 INSERT INTO ConfigurationAdmin VALUES ('UseChangeLog', 'la_Text_Website', 'la_config_UseChangeLog', 'checkbox', '', '', 10.25, 0, 0);
 INSERT INTO ConfigurationAdmin VALUES ('AutoRefreshIntervals', 'la_Text_Website', 'la_config_AutoRefreshIntervals', 'text', '', '', 10.26, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('RememberLastPageForAdminUsers', 'la_Text_General', 'la_prompt_remember_last_page_for_admin_users', 'checkbox', '', '', 11, 0, 0);
+INSERT INTO ConfigurationAdmin VALUES ('RememberLastAdminTemplate', 'la_Text_General', 'la_config_RememberLastAdminTemplate', 'checkbox', '', '', 10.13, 0, 0);
 
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Columns_Category', '2', 'In-Portal', 'Categories');
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'DomainSelect','1','In-Portal','in-portal:configure_general');
@@ -237,7 +237,7 @@
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'PageHitCounter', 0, 'In-Portal', 'in-portal:configure_general');
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseChangeLog', '0', 'In-Portal', 'in-portal:configure_general');
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AutoRefreshIntervals', '1,5,15,30,60,120,240', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'RememberLastPageForAdminUsers', '', 'In-Portal:Users', 'in-portal:configure_users');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'RememberLastAdminTemplate', '', 'In-Portal:Users', 'in-portal:configure_users');
 
 INSERT INTO Events VALUES (DEFAULT, 'USER.ADD', NULL, 1, 0, 'In-Portal:Users', 'la_event_user.add', 0);
 INSERT INTO Events VALUES (DEFAULT, 'USER.ADD', NULL, 2, 0, 'In-Portal:Users', 'la_event_user.add', 1);
Index: branches/RC/admin/install/langpacks/english.lang
===================================================================
diff -u -N -r10447 -r10448
--- branches/RC/admin/install/langpacks/english.lang	(.../english.lang)	(revision 10447)
+++ branches/RC/admin/install/langpacks/english.lang	(.../english.lang)	(revision 10448)
@@ -2939,7 +2939,7 @@
 			<PHRASE Label="Next Theme" Module="In-Portal" Type="0">TmV4dCBUaGVtZQ==</PHRASE>
 			<PHRASE Label="Previous Theme" Module="In-Portal" Type="0">UHJldmlvdXMgVGhlbWU=</PHRASE>
 			<PHRASE Label="test 1" Module="In-Portal" Type="0">dGVzdCAy</PHRASE>
-			<PHRASE Label="la_prompt_remember_last_page_for_admin_users" Module="In-Portal" Type="1">UmVtZW1iZXIgTGFzdCBQYWdlIEZvciBBZG1pbiBVc2Vycw==</PHRASE>
+			<PHRASE Label="la_config_RememberLastAdminTemplate" Module="In-Portal" Type="1">UmVtZW1iZXIgTGFzdCBBZG1pbiBUZW1wbGF0ZQ==</PHRASE>
 		</PHRASES>
 		<EVENTS>
 			<EVENT MessageType="text" Event="CATEGORY.ADD" Type="0">U3ViamVjdDogQ2F0ZWdvcnkgYWRkZWQKCllvdXIgc3VnZ2VzdGVkIGNhdGVnb3J5ICI8aW5wOm1fY2F0ZWdvcnlfZmllbGQgX0ZpZWxkPSJOYW1lIiBfU3RyaXBIVE1MPSIxIi8+IiBoYXMgYmVlbiBhZGRlZC4=</EVENT>
Index: branches/RC/admin/install/upgrades/inportal_upgrade_v4.3.1.sql
===================================================================
diff -u -N -r10423 -r10448
--- branches/RC/admin/install/upgrades/inportal_upgrade_v4.3.1.sql	(.../inportal_upgrade_v4.3.1.sql)	(revision 10423)
+++ branches/RC/admin/install/upgrades/inportal_upgrade_v4.3.1.sql	(.../inportal_upgrade_v4.3.1.sql)	(revision 10448)
@@ -2,4 +2,7 @@
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'KeepSessionOnBrowserClose', '1', 'In-Portal', 'in-portal:configure_general');
 
 UPDATE Modules SET Version = '4.3.1' WHERE Name = 'Core';
-UPDATE Modules SET Version = '4.3.1' WHERE Name = 'In-Portal';
\ No newline at end of file
+UPDATE Modules SET Version = '4.3.1' WHERE Name = 'In-Portal';
+
+INSERT INTO ConfigurationAdmin VALUES ('RememberLastAdminTemplate', 'la_Text_General', 'la_config_RememberLastAdminTemplate', 'checkbox', '', '', 10.13, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'RememberLastAdminTemplate', '', 'In-Portal:Users', 'in-portal:configure_users');