diff --git a/phpBB/adm/style/captcha_gd_acp.html b/phpBB/adm/style/captcha_gd_acp.html
index f4755a37da..d1f50bc899 100755
--- a/phpBB/adm/style/captcha_gd_acp.html
+++ b/phpBB/adm/style/captcha_gd_acp.html
@@ -49,13 +49,9 @@
 </fieldset>
 <fieldset>
 	<legend>{L_PREVIEW}</legend>
-<!-- IF PREVIEW -->
-	<div class="successbox">
-		<h3>{L_WARNING}</h3>
-		<p>{L_CAPTCHA_PREVIEW_MSG}</p>
-	</div>
+	<!-- IF CAPTCHA_PREVIEW -->
 	<!-- INCLUDE {CAPTCHA_PREVIEW} -->
-<!-- ENDIF -->
+	<!-- ENDIF -->
 
 </fieldset>
 
diff --git a/phpBB/adm/style/captcha_recaptcha_acp.html b/phpBB/adm/style/captcha_recaptcha_acp.html
index 78f035a01d..fba59a9647 100644
--- a/phpBB/adm/style/captcha_recaptcha_acp.html
+++ b/phpBB/adm/style/captcha_recaptcha_acp.html
@@ -31,7 +31,7 @@
 		<p>{L_CAPTCHA_PREVIEW_MSG}</p>
 	</div>
 <!-- ENDIF -->
-<!-- include {CAPTCHA_PREVIEW} -->
+<!-- INCLUDE {CAPTCHA_PREVIEW} -->
 </fieldset>
 
 <fieldset class="submit-buttons">
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index 50a456179b..bd8fbce0fa 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -107,7 +107,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
 			}
 
 			$template->assign_vars(array(
-				'CAPTCHA_PREVIEW'	=> $this->get_demo_template(),
+				'CAPTCHA_PREVIEW'	=> $this->get_demo_template($id),
 				'CAPTCHA_NAME'		=> $this->get_class_name(),
 			));