diff --git a/captcha.admin.inc b/captcha.admin.inc
index 8163898..e43e175 100644
--- a/captcha.admin.inc
+++ b/captcha.admin.inc
@@ -58,6 +58,12 @@ function captcha_admin_settings() {
     '#options' => _captcha_available_challenge_types(FALSE),
     '#default_value' => variable_get('captcha_default_challenge', 'captcha/Math'),
   );
+  $form['captcha_form_protection']['captcha_all_forms'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Add default CAPTCHA to all forms not listed below'),
+    '#default_value' => variable_get('captcha_all_forms', FALSE),
+    '#description' => t('Choose this option to have the default CAPTCHA added to all forms not in the list below.'),
+  );
   // List known form_ids.
   $form['captcha_form_protection']['captcha_form_id_overview'] = array(
     '#theme' => 'captcha_admin_settings_captcha_points',
@@ -266,6 +272,7 @@ function captcha_admin_settings_submit($form, &$form_state) {
   variable_set('captcha_allow_on_admin_pages', $form_state['values']['captcha_allow_on_admin_pages']);
 
   variable_set('captcha_default_challenge', $form_state['values']['captcha_default_challenge']);
+  variable_set('captcha_all_forms', $form_state['values']['captcha_all_forms']);
 
   // Process CAPTCHA points
   if (isset($form_state['values']['captcha_form_id_overview']['captcha_captcha_points'])) {
diff --git a/captcha.inc b/captcha.inc
index e8212b1..75825ea 100644
--- a/captcha.inc
+++ b/captcha.inc
@@ -72,10 +72,19 @@ function captcha_get_form_id_setting($form_id, $symbolic=FALSE) {
   $result = db_query("SELECT module, captcha_type FROM {captcha_points} WHERE form_id = :form_id",
     array(':form_id' =>  $form_id));
   $captcha_point = $result->fetchObject();
+
+  // If captcha_all_forms is TRUE, apply the default to any form that does
+  // not have a CAPTCHA specified.
   if (!$captcha_point) {
-    $captcha_point = NULL;
+    if (variable_get('captcha_all_forms', FALSE)) {
+      $captcha_point = (object) array('captcha_type' => 'default');
+    }
+    else {
+      return NULL;
+    }
   }
-  elseif ($captcha_point->captcha_type == 'default') {
+
+  if ($captcha_point->captcha_type == 'default') {
     if (!$symbolic) {
       list($module, $type) = explode('/', variable_get('captcha_default_challenge', 'captcha/Math'));
       $captcha_point->module = $module;