2 files changed, 7 insertions, 3 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 4507e5c371..8450cc4ab7 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2117,10 +2117,9 @@ function change_database_data(&$no_updates, $version)
 				_sql($sql, $errored, $error_ary);
 			}
 
-			if (!isset($config['use_system_cron']))
+			if (!isset($config['legend_sort_groupname']))
 			{
 				set_config('legend_sort_groupname', '0');
-				set_config('teampage_multiple', '1');
 				set_config('teampage_forums', '1');
 			}
 
@@ -2260,6 +2259,11 @@ function change_database_data(&$no_updates, $version)
 				set_config('load_cpf_pm', '0');
 			}
 
+			if (!isset($config['teampage_memberships']))
+			{
+				set_config('teampage_memberships', '1');
+			}
+
 			$no_updates = false;
 		break;
 	}
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 5506922e17..4361ca45c3 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -243,7 +243,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_host', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_password', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_port', '25');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_username', '');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('teampage_multiple', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('teampage_memberships', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('teampage_forums', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page', '25');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');