Index: webform.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/webform.module,v
retrieving revision 1.196.2.58
diff -u -p -r1.196.2.58 webform.module
--- webform.module	1 Oct 2010 00:59:32 -0000	1.196.2.58
+++ webform.module	5 Oct 2010 13:17:56 -0000
@@ -1382,7 +1382,9 @@ function webform_client_form(&$form_stat
   // Set the form action to the node ID in case this is being displayed on the
   // teaser, subsequent pages should be on the node page directly.
   if (empty($submission)) {
-    $form['#action'] = url('node/' . $node->nid);
+    $query = $_GET;
+    unset($query['q']);
+    $form['#action'] = url($_GET['q'], array('query' => $query));
   }
 
   $form['#submit'] = array('webform_client_form_pages', 'webform_client_form_submit');