diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 1956ade31a..ab44920f0a 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -398,7 +398,7 @@ class acp_board
 					'vars'	=> array(
 						'legend1'				=> 'ACP_SECURITY_SETTINGS',
 						'allow_autologin'		=> array('lang' => 'ALLOW_AUTOLOGIN',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'allow_forgot_password'	=> array('lang' => 'ALLOW_FORGOT_PASSWORD',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
+						'allow_password_reset'	=> array('lang' => 'ALLOW_PASSWORD_RESET',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'max_autologin_time'	=> array('lang' => 'AUTOLOGIN_LENGTH',		'validate' => 'int:0',	'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']),
 						'ip_check'				=> array('lang' => 'IP_VALID',				'validate' => 'int',	'type' => 'custom', 'method' => 'select_ip_check', 'explain' => true),
 						'browser_check'			=> array('lang' => 'BROWSER_VALID',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
diff --git a/phpBB/includes/db/migration/data/310/dev.php b/phpBB/includes/db/migration/data/310/dev.php
index d3f3a341b2..0794567f1b 100644
--- a/phpBB/includes/db/migration/data/310/dev.php
+++ b/phpBB/includes/db/migration/data/310/dev.php
@@ -84,7 +84,7 @@ class phpbb_db_migration_data_310_dev extends phpbb_db_migration
 		return array(
 			array('config.update', array('search_type', 'phpbb_search_' . $this->config['search_type'])),
 
-			array('config.add', array('allow_forgot_password', 1)),
+			array('config.add', array('allow_password_reset', 1)),
 
 			array('config.add', array('fulltext_postgres_ts_name', 'simple')),
 			array('config.add', array('fulltext_postgres_min_word_len', 4)),
diff --git a/phpBB/includes/ucp/ucp_remind.php b/phpBB/includes/ucp/ucp_remind.php
index a25d7da91a..4a2d06e99a 100644
--- a/phpBB/includes/ucp/ucp_remind.php
+++ b/phpBB/includes/ucp/ucp_remind.php
@@ -29,7 +29,7 @@ class ucp_remind
 		global $config, $phpbb_root_path, $phpEx;
 		global $db, $user, $auth, $template;
 
-		if (!$config['allow_forgot_password'])
+		if (!$config['allow_password_reset'])
 		{
 			trigger_error($user->lang('UCP_FORGOT_PASSWORD_DISABLE', '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>'));
 		}
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index d9ba09ff4d..9690ec14b8 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -18,7 +18,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_bbcode', '1'
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_birthdays', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_bookmarks', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_emailreuse', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_forgot_password', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_password_reset', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_forum_notify', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_mass_pm', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_name_chars', 'USERNAME_CHARS_ANY');
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 4b2020b894..c0f6153788 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -454,8 +454,8 @@ $lang = array_merge($lang, array(
 	'ALL'							=> 'All',
 	'ALLOW_AUTOLOGIN'				=> 'Allow "Remember Me" logins',
 	'ALLOW_AUTOLOGIN_EXPLAIN'		=> 'Determines whether users are given "Remember Me" option when they visit the board.',
-	'ALLOW_FORGOT_PASSWORD'			=> 'Allow "forgot password"',
-	'ALLOW_FORGOT_PASSWORD_EXPLAIN'	=> 'Determines whether users can use the "forgot password" option to recover their account',
+	'ALLOW_PASSWORD_RESET'			=> 'Allow "forgot password"',
+	'ALLOW_PASSWORD_RESET_EXPLAIN'	=> 'Determines whether users can use the "forgot password" option to recover their account',
 	'AUTOLOGIN_LENGTH'				=> '"Remember Me" login key expiration length (in days)',
 	'AUTOLOGIN_LENGTH_EXPLAIN'		=> 'Number of days after which "Remember Me" login keys are removed or zero to disable.',
 	'BROWSER_VALID'					=> 'Validate browser',