diff --git a/includes/FeedsConfigurable.inc b/includes/FeedsConfigurable.inc
index 1951a7c13673f336b20d3fbb9264a0a9c3344bcf..f24001261f6a6512c9f803e978caad7d577c4f58 100644
--- a/includes/FeedsConfigurable.inc
+++ b/includes/FeedsConfigurable.inc
@@ -149,8 +149,11 @@ abstract class FeedsConfigurable {
     $form_state = array();
     $form = $this->configForm($form_state);
     // Mimic Form API behavior.
+    drupal_prepare_form('form_'. get_class($this) .'_feeds_config_form', $form, $form_state);
     drupal_alter('form_'. get_class($this) .'_feeds_config_form', $form, $form_state);
     drupal_alter('form', $form, $form_state, get_class($this) .'_feeds_config_form');
+    unset($form['form_token']);
+    unset($form['form_id']);
     $defaults = array();
     foreach (element_children($form) as $e) {
       if (isset($form[$e]['#default_value'])) {