--- ../ahah_helper.module	2009-02-14 16:48:36.000000000 +0100
+++ ahah_helper.module	2010-01-01 19:40:15.887334039 +0100
@@ -75,7 +75,17 @@ function ahah_helper_register(&$form, &$
 
   // This is an AHAH-driven form, so enable caching.
   $form['#cache'] = TRUE;
-
+  
+  // When not set.. try to remember the old action
+  if (!isset($form_state['storage']['old_action'])) {
+    $form_state['storage']['old_action'] = $form['#action'];
+  }
+  // If the form action change, restore the old one.
+  if ( isset($form_state['storage']['old_action']) && 
+          ($form['#action']!=$form_state['storage']['old_action']) )
+  {
+    $form['#action'] = $form_state['storage']['old_action'];
+  }
   // Register the file.
   if (!isset($form_state['storage']['#ahah_helper']['file'])) {
     $menu_item = menu_get_item();