Index: branches/RC/admin/install/inportal_data.sql
===================================================================
diff -u -r9524 -r9531
--- branches/RC/admin/install/inportal_data.sql	(.../inportal_data.sql)	(revision 9524)
+++ branches/RC/admin/install/inportal_data.sql	(.../inportal_data.sql)	(revision 9531)
@@ -1,5 +1,5 @@
 INSERT INTO ConfigurationAdmin VALUES ('AllowDeleteRootCats', 'la_Text_General', 'la_AllowDeleteRootCats', 'checkbox', NULL , NULL , 10.08, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('Catalog_PreselectModuleTab', 'la_Text_General', 'la_config_CatalogPreselectModuleTab', 'checkbox', NULL, NULL, 10.09, 0, 0);
+INSERT INTO ConfigurationAdmin VALUES ('Catalog_PreselectModuleTab', 'la_Text_General', 'la_config_CatalogPreselectModuleTab', 'checkbox', NULL, NULL, 10.09, 0, 1);
 
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AllowDeleteRootCats', '0', 'In-Portal', 'in-portal:configure_categories');
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Catalog_PreselectModuleTab', 1, 'In-Portal', 'in-portal:configure_categories');
Index: branches/RC/admin/install/upgrades/inportal_upgrade_v4.2.1.sql
===================================================================
diff -u -r9524 -r9531
--- branches/RC/admin/install/upgrades/inportal_upgrade_v4.2.1.sql	(.../inportal_upgrade_v4.2.1.sql)	(revision 9524)
+++ branches/RC/admin/install/upgrades/inportal_upgrade_v4.2.1.sql	(.../inportal_upgrade_v4.2.1.sql)	(revision 9531)
@@ -15,7 +15,7 @@
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'User_Default_Registration_Country', '', 'In-Portal:Users', 'in-portal:configure_users');
 
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Catalog_PreselectModuleTab', 1, 'In-Portal', 'in-portal:configure_categories');
-INSERT INTO ConfigurationAdmin VALUES ('Catalog_PreselectModuleTab', 'la_Text_General', 'la_config_CatalogPreselectModuleTab', 'checkbox', NULL, NULL, 10.09, 0, 0);
+INSERT INTO ConfigurationAdmin VALUES ('Catalog_PreselectModuleTab', 'la_Text_General', 'la_config_CatalogPreselectModuleTab', 'checkbox', NULL, NULL, 10.09, 0, 1);
 
 UPDATE Modules SET Version = '4.2.1' WHERE Name = 'Core';
 UPDATE Modules SET Version = '4.2.1' WHERE Name = 'In-Portal';
\ No newline at end of file
Index: branches/RC/themes/default2007/platform/thankyou.tpl
===================================================================
diff -u -r9517 -r9531
--- branches/RC/themes/default2007/platform/thankyou.tpl	(.../thankyou.tpl)	(revision 9517)
+++ branches/RC/themes/default2007/platform/thankyou.tpl	(.../thankyou.tpl)	(revision 9531)
@@ -11,27 +11,17 @@
 
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar"/>
-
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_Thankyou" templates="platform/thankyou"/>
 	
 	<inp2:m_RenderElement design="content_box">
-		<inp2:m_Capture to_var="header">
-			<inp2:m_if check="m_Get" name="thankyou_header">
-				<inp2:m_phrase name="$thankyou_header"/>
-			<inp2:m_else/>
-				<inp2:m_phrase name="lu_title_Thankyou"/>
-			</inp2:m_if>
+		<inp2:m_Capture to_var="header">			
+				<inp2:m_Phrase source="get" name="thankyou_header" default="lu_title_Thankyou"/>			
 		</inp2:m_Capture>
-
-		<inp2:m_if check="m_Get" name="thankyou_header">
-			<inp2:m_phrase name="$thankyou_text"/>
-		<inp2:m_else/>
-			<inp2:m_Phrase label="lu_Thankyou"/>
-		</inp2:m_if>
 		
+		<inp2:m_Phrase source="get" name="thankyou_text" default="lu_text_Thankyou"/>
+		
 		<br /><br />
 
-		<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_Ok"/>" onClick="window.location.href='<inp2:m_Link template="index"/>'" />&nbsp;
+		<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_Ok"/>" onClick="window.location.href='<inp2:m_Link template="__default__"/>'" />&nbsp;
 	</inp2:m_RenderElement>
 	
 </inp2:m_DefineElement>