diff --git a/mollom.module b/mollom.module
index 750a228..b9390ed 100644
--- a/mollom.module
+++ b/mollom.module
@@ -1751,9 +1751,6 @@ function mollom_form_add_captcha(&$element, &$form_state) {
   // Otherwise, we have a communication or configuration error.
   else {
     $element['captcha']['#access'] = FALSE;
-    $element['captcha']['#required'] = FALSE;
-    $form_state['mollom']['require_analysis'] = FALSE;
-    $form_state['mollom']['require_captcha'] = FALSE;
     // Trigger fallback mode.
     _mollom_fallback();
   }
diff --git a/tests/mollom.test b/tests/mollom.test
index 12b1520..190fc4e 100644
--- a/tests/mollom.test
+++ b/tests/mollom.test
@@ -1664,6 +1664,13 @@ class MollomFallbackModeTestCase extends MollomWebTestCase {
     $this->drupalGet('user/password', array('watchdog' => WATCHDOG_EMERG));
     $this->assertNoCaptchaField();
     $this->assertText($this->fallback_message);
+
+    // Verify that the form cannot be submitted.
+    $edit = array(
+      'name' => $this->admin_user->name,
+    );
+    $this->drupalPost(NULL, $edit, t('E-mail new password'), array('watchdog' => WATCHDOG_EMERGENCY));
+    $this->assertNoText(t('Further instructions have been sent to your e-mail address.'));
   }
 
   /**