diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html
index 290aaa254c..3d87aa89ec 100644
--- a/phpBB/adm/style/acp_captcha.html
+++ b/phpBB/adm/style/acp_captcha.html
@@ -17,6 +17,10 @@
 	<dd><label><input type="radio" class="radio" id="enable_confirm" name="enable_confirm" value="1"<!-- IF REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
 		<label><input type="radio" class="radio" name="enable_confirm" value="0"<!-- IF not REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
 </dl>
+<dl>
+	<dt><label for="max_reg_attempts">{L_REG_LIMIT}:</label><br /><span>{L_REG_LIMIT_EXPLAIN}</span></dt>
+	<dd><input id="max_reg_attempts" type="text" size="4" maxlength="4" name="max_reg_attempts" value="{REG_LIMIT}" /></dd>
+</dl>
 <dl>
 	<dt><label for="enable_post_confirm">{L_VISUAL_CONFIRM_POST}:</label><br /><span>{L_VISUAL_CONFIRM_POST_EXPLAIN}</span></dt>
 	<dd><label><input type="radio" class="radio" id="enable_post_confirm" name="enable_post_confirm" value="1"<!-- IF POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
diff --git a/phpBB/includes/acp/acp_captcha.php b/phpBB/includes/acp/acp_captcha.php
index 2fc8fe7486..c3588ceb9e 100644
--- a/phpBB/includes/acp/acp_captcha.php
+++ b/phpBB/includes/acp/acp_captcha.php
@@ -52,9 +52,10 @@ class acp_captcha
 			$captchas = phpbb_captcha_factory::get_captcha_types();
 
 			$config_vars = array(
-				'enable_confirm'		=> 'REG_ENABLE',
-				'enable_post_confirm'	=> 'POST_ENABLE',
-				'confirm_refresh'		=> 'CONFIRM_REFRESH',
+				'enable_confirm'		=> array('tpl' => 'REG_ENABLE', 'default' => false),
+				'enable_post_confirm'	=> array('tpl' => 'POST_ENABLE', 'default' => false),
+				'confirm_refresh'		=> array('tpl' => 'CONFIRM_REFRESH', 'default' => false),
+				'max_reg_attempts'		=> array('tpl' => 'REG_LIMIT', 'default' => 0),
 			);
 
 			$this->tpl_name = 'acp_captcha';
@@ -67,10 +68,9 @@ class acp_captcha
 			if ($submit && check_form_key($form_key))
 			{
 				$config_vars = array_keys($config_vars);
-
-				foreach ($config_vars as $config_var)
+				foreach ($config_vars as $config_var => $options)
 				{
-					set_config($config_var, request_var($config_var, false));
+					set_config($config_var, request_var($config_var, $options['default']));
 				}
 
 				if ($selected !== $config['captcha_plugin'])
@@ -115,9 +115,9 @@ class acp_captcha
 
 				$demo_captcha =& phpbb_captcha_factory::get_instance($selected);
 
-				foreach ($config_vars as $config_var => $template_var)
+				foreach ($config_vars as $config_var => $options)
 				{
-					$template->assign_var($template_var, (isset($_REQUEST[$config_var])) ? request_var($config_var, '') : $config[$config_var]) ;
+					$template->assign_var($options['tpl'], (isset($_POST[$config_var])) ? request_var($config_var, $options['default']) : $config[$config_var]) ;
 				}
 
 				$template->assign_vars(array(
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index c240aeee55..bebc9e3435 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -274,7 +274,7 @@ $lang = array_merge($lang, array(
 
 // Visual Confirmation Settings
 $lang = array_merge($lang, array(
-	'ACP_VC_SETTINGS_EXPLAIN'				=> 'Here you are able to define visual confirmation defaults and CAPTCHA settings.',
+	'ACP_VC_SETTINGS_EXPLAIN'				=> 'Here you can select and configure CAPTCHA plugins, which implement various ways to reject registration attempts from so-called spambots.',
 	'AVAILABLE_CAPTCHAS'					=> 'Available plugins',
 	'CAPTCHA_UNAVAILABLE'					=> 'The CAPTCHA cannot be selected as its requirements are not met.',
 	'CAPTCHA_GD'							=> 'GD CAPTCHA',
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 55eadc8341..9a7fda5951 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -188,7 +188,7 @@ $lang = array_merge($lang, array(
 	'ACP_USER_SIG'					=> 'Signature',
 	'ACP_USER_WARNINGS'				=> 'Warnings',
 
-	'ACP_VC_SETTINGS'					=> 'Visual confirmation settings',
+	'ACP_VC_SETTINGS'					=> 'CAPTCHA module settings',
 	'ACP_VC_CAPTCHA_DISPLAY'			=> 'CAPTCHA image preview',
 	'ACP_VERSION_CHECK'					=> 'Check for updates',
 	'ACP_VIEW_ADMIN_PERMISSIONS'		=> 'View administrative permissions',
@@ -493,7 +493,7 @@ $lang = array_merge($lang, array(
 	'LOG_CONFIG_SERVER'			=> '<strong>Altered server settings</strong>',
 	'LOG_CONFIG_SETTINGS'		=> '<strong>Altered board settings</strong>',
 	'LOG_CONFIG_SIGNATURE'		=> '<strong>Altered signature settings</strong>',
-	'LOG_CONFIG_VISUAL'			=> '<strong>Altered visual confirmation settings</strong>',
+	'LOG_CONFIG_VISUAL'			=> '<strong>Altered antibot settings</strong>',
 
 	'LOG_APPROVE_TOPIC'			=> '<strong>Approved topic</strong><br />» %s',
 	'LOG_BUMP_TOPIC'			=> '<strong>User bumped topic</strong><br />» %s',