diff --git a/core/util.inc.php b/core/util.inc.php
index d6ce5354..c1333151 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -253,8 +253,8 @@ function captcha_get_html() {
 	if(DEBUG && ip_in_range($_SERVER['REMOTE_ADDR'], "127.0.0.0/8")) return "";
 
 	$captcha = "";
-	if($user->is_anonymous() && $config->get_bool("use_captchas")) {
-		$rpk = $config->get_string("api_recaptcha_pubkey");
+	if($user->is_anonymous() && $config->get_bool("comment_captcha")) {
+		$rpk = $config->get_string("api_recaptcha_privkey");
 		if(!empty($rpk)) {
 			$captcha = recaptcha_get_html($rpk);
 		}
@@ -274,8 +274,8 @@ function captcha_check() {
 
 	if(DEBUG && ip_in_range($_SERVER['REMOTE_ADDR'], "127.0.0.0/8")) return true;
 
-	if($user->is_anonymous() && $config->get_bool("use_captchas")) {
-		$rpk = $config->get_string('api_recaptcha_privkey');
+	if($user->is_anonymous() && $config->get_bool("comment_captcha")) {
+		$rpk = $config->get_string('api_recaptcha_pubkey');
 		if(!empty($rpk)) {
 			$resp = recaptcha_check_answer(
 					$rpk,
diff --git a/ext/setup/main.php b/ext/setup/main.php
index e53061b1..f1885568 100644
--- a/ext/setup/main.php
+++ b/ext/setup/main.php
@@ -171,7 +171,7 @@ class Setup extends SimpleExtension {
 		$config->set_default_string("theme", "default");
 		$config->set_default_bool("use_autodate", true);
 		$config->set_default_bool("word_wrap", true);
-		$config->set_default_bool("use_captchas", false);
+		$config->set_default_bool("comment_captcha", false);
 		$config->set_default_string("autodate_format", "F j, Y");
 		// Automatic caching is disabled by default
 		$config->set_default_string("autocache_location", "data/cache");