diff --git a/dwoo/templates/img_post_box.tpl b/dwoo/templates/img_post_box.tpl
index e396091..ea474dc 100644
--- a/dwoo/templates/img_post_box.tpl
+++ b/dwoo/templates/img_post_box.tpl
@@ -27,15 +27,6 @@
 			{t}Email{/t}</td>
 		<td>
 			<input type="text" name="em" size="28" maxlength="75" accesskey="e" />
-		</td>
-	</tr>
-	{if $board.enablecaptcha eq 1}
-		<tr>
-			<td class="postblock'">
-				<a href="#" onclick="javascript:document.getElementById('captchaimage').src = '{%KU_CGIPATH}/captcha.php?' + Math.random();return false;"><img id="captchaimage" src="{%KU_CGIPATH}/captcha.php" border="0" width="90" height="25" alt="Captcha image"></a>
-			</td>
-			<td>
-				<input type="text" name="captcha" size="28" maxlength="10" accesskey="c" />
 			</td>
 		</tr>
 	{/if}
@@ -61,6 +52,12 @@
 			<textarea name="message" cols="48" rows="4" accesskey="m"></textarea>
 		</td>
 	</tr>
+	{if $board.enablecaptcha eq 1}
+		<tr>
+			<td class="postblock">{t}Captcha{/t}</td>
+			<td colspan="2">{$recaptcha}</td>
+		</tr>
+	{/if}
 	{if $board.uploadtype eq 0 || $board.uploadtype eq 1}
 		<tr>
 			<td class="postblock">
diff --git a/dwoo/templates/oek_post_box.tpl b/dwoo/templates/oek_post_box.tpl
index 468b9f1..e156660 100644
--- a/dwoo/templates/oek_post_box.tpl
+++ b/dwoo/templates/oek_post_box.tpl
@@ -56,15 +56,6 @@
 				<input type="text" name="em" size="28" maxlength="75" accesskey="e" />
 			</td>
 		</tr>
-		{if $board.enablecaptcha eq 1}
-			<tr>
-				<td class="postblock'">
-					<a href="#" onclick="javascript:document.getElementById('captchaimage').src = '{%KU_CGIPATH}/captcha.php?' + Math.random();return false;"><img id="captchaimage" src="{%KU_CGIPATH}/captcha.php" border="0" width="90" height="25" alt="Captcha image"></a>
-				</td>
-				<td>
-					<input type="text" name="captcha" size="28" maxlength="10" accesskey="c" />
-				</td>
-			</tr>
 		{/if}
 		<tr>
 			<td class="postblock">
@@ -88,6 +79,12 @@
 				<textarea name="message" cols="48" rows="4" accesskey="m"></textarea>
 			</td>
 		</tr>
+	{if $board.enablecaptcha eq 1}
+		<tr>
+			<td class="postblock">{t}Captcha{/t}</td>
+			<td colspan="2">{$recaptcha}</td>
+		</tr>
+	{/if}
 		{if $board.uploadtype eq 0 || $board.uploadtype eq 1}
 			<tr>
 				<td class="postblock">
diff --git a/dwoo/templates/txt_post_box.tpl b/dwoo/templates/txt_post_box.tpl
index 8814e81..eb300c0 100644
--- a/dwoo/templates/txt_post_box.tpl
+++ b/dwoo/templates/txt_post_box.tpl
@@ -43,13 +43,10 @@
 			{/if}
 
 			{if $board.enablecaptcha eq 1}
-				<td class="label"><label for="captcha">{t}Captcha{/t}:</label></td>
-				<td>
-					<a href="#" onclick="javascript:document.getElementById('captchaimage').src = '{%KU_CGIPATH}/captcha.php?' + Math.random();return false;">
-					<img id="captchaimage" src="{%KU_CGIPATH}/captcha.php" border="0" width="90" height="30" alt="Captcha image" />
-					</a>&nbsp;
-					<input type="text" id="captcha" name="captcha" size="8" maxlength="6" />
-				</td>
+				<tr>
+					<td class="postblock">{t}Captcha{/t}</td>
+					<td colspan="2">{$recaptcha}</td>
+				</tr>
 			{/if}
 			{if ($board.forcedanon eq 1 && $board.enablecaptcha neq 1) || $board.forcedanon neq 1}
 				<td class="label">
diff --git a/dwoo/templates/upl_post_box.tpl b/dwoo/templates/upl_post_box.tpl
index f073aad..ac6a471 100644
--- a/dwoo/templates/upl_post_box.tpl
+++ b/dwoo/templates/upl_post_box.tpl
@@ -29,15 +29,6 @@
 			<input type="text" name="em" size="28" maxlength="75" accesskey="e" />
 		</td>
 	</tr>
-	{if $board.enablecaptcha eq 1}
-		<tr>
-			<td class="postblock'">
-				<a href="#" onclick="javascript:document.getElementById('captchaimage').src = '{%KU_CGIPATH}/captcha.php?' + Math.random();return false;"><img id="captchaimage" src="{%KU_CGIPATH}/captcha.php" border="0" width="90" height="25" alt="Captcha image"></a>
-			</td>
-			<td>
-				<input type="text" name="captcha" size="28" maxlength="10" accesskey="c" />
-			</td>
-		</tr>
 	{/if}
 	<tr>
 		<td class="postblock">
@@ -61,6 +52,12 @@
 			<textarea name="message" cols="48" rows="4" accesskey="m"></textarea>
 		</td>
 	</tr>
+	{if $board.enablecaptcha eq 1}
+		<tr>
+			<td class="postblock">{t}Captcha{/t}</td>
+			<td colspan="2">{$recaptcha}</td>
+		</tr>
+	{/if}
 	{if $board.uploadtype eq 0 || $board.uploadtype eq 1}
 		<tr>
 			<td class="postblock">
diff --git a/inc/classes/manage.class.php b/inc/classes/manage.class.php
index bdb465b..bde0a8b 100644
--- a/inc/classes/manage.class.php
+++ b/inc/classes/manage.class.php
@@ -3271,17 +3271,14 @@ class Manage {
 								
 							foreach($results AS $line) {
 								$tc_db->Execute("UPDATE `".KU_DBPREFIX."posts` SET `message` = ".$tc_db->qstr($line['message'] . $ban_msg)." WHERE `boardid` = " . $tc_db->qstr($ban_board_id) . " AND `id` = ".$tc_db->qstr($postids[$i]));
-								echo $ban_msg . ' Post ' . $i;
 								clearPostCache($postids[$i], $ban_board_id);
 								if ($line['parentid']==0) {
 									if (!in_array($postids, $regenerated)) {
 										$regenerated[] = $postids[$i];
-										echo 'Line 3368';
 									}
 								} else {
 									if (!in_array($line['parentid'], $regenerated)) {
 										$regenerated[] = $line['parentid'];
-										echo 'Line 3373';
 									}
 								}
 							}