diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 791981854c..3c913f347c 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -243,6 +243,7 @@ services:
         arguments:
             - @auth
             - @config
+            - @config_text
             - @dbal.conn
             - @user
             - %core.root_path%
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 5d879a4be6..7f2cf13bbf 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -83,9 +83,6 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('check_attachment_c
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('check_dnsbl', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('chg_passforce', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('contact_admin_form_enable', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('contact_admin_info_uid', '');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('contact_admin_info_bitfield', '');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('contact_admin_info_flags', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_domain', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_name', 'phpbb3');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_path', '/');
@@ -305,6 +302,9 @@ INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('warnin
 
 # Config text
 INSERT INTO phpbb_config_text (config_name, config_value) VALUES ('contact_admin_info', '');
+INSERT INTO phpbb_config_text (config_name, config_value) VALUES ('contact_admin_info_uid', '');
+INSERT INTO phpbb_config_text (config_name, config_value) VALUES ('contact_admin_info_bitfield', '');
+INSERT INTO phpbb_config_text (config_name, config_value) VALUES ('contact_admin_info_flags', '');
 
 # -- Forum related auth options
 INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_', 1);
diff --git a/phpBB/phpbb/message/admin_form.php b/phpBB/phpbb/message/admin_form.php
index aa185da740..b71b3fc535 100644
--- a/phpBB/phpbb/message/admin_form.php
+++ b/phpBB/phpbb/message/admin_form.php
@@ -157,11 +157,18 @@ class admin_form extends form
 		$l_admin_info = $this->config_text->get('contact_admin_info');
 		if ($l_admin_info)
 		{
+			$contact_admin_data			= $this->config_text->get_array(array(
+				'contact_admin_info',
+				'contact_admin_info_uid',
+				'contact_admin_info_bitfield',
+				'contact_admin_info_flags',
+			));
+
 			$l_admin_info = generate_text_for_display(
-				$this->config_text->get('contact_admin_info'),
-				$this->config['contact_admin_info_uid'],
-				$this->config['contact_admin_info_bitfield'],
-				$this->config['contact_admin_info_flags']
+				$contact_admin_data['contact_admin_info'],
+				$contact_admin_data['contact_admin_info_uid'],
+				$contact_admin_data['contact_admin_info_bitfield'],
+				$contact_admin_data['contact_admin_info_flags']
 			);
 		}