=== modified file 'captcha.module'
--- captcha.module	2007-06-20 22:31:42 +0000
+++ captcha.module	2007-06-21 07:45:39 +0000
@@ -66,7 +66,7 @@
   if ($form_id) {
     switch ($op) {
       case 'disable':
-        db_query("UPDATE {captcha_points} SET visible=0 WHERE form_id='%s'", $form_id);
+        db_query("UPDATE {captcha_points} SET captcha_type=NULL WHERE form_id='%s'", $form_id);
         drupal_set_message(t('Disabled captcha point %form_id.', array('%form_id'=>$form_id)));
         drupal_goto('admin/settings/captcha');
         break;
@@ -287,7 +287,7 @@
       return;
     }
     // get captcha type and return if no captcha set
-    $captcha_type = db_result(db_query("SELECT captcha_type FROM {captcha_points} WHERE form_id='%s'", $form_id));
+    $captcha_type = db_result(db_query("SELECT captcha_type FROM {captcha_points} WHERE visible=1 AND form_id='%s'", $form_id));
     if (!$captcha_type) {
       return;
     }