--- salesforcewebform_orig/salesforcewebform.module 2009-04-21 19:49:16.000000000 -0700
+++ salesforcewebform/salesforcewebform.module  2010-11-04 15:43:02.000000000 -0700
@@ -75,14 +75,21 @@ function salesforcewebform_form_alter(&$
      ); 
      $form['advanced']['form_key'] = $new_form_key;
      $form['advanced']['#collapsed'] = FALSE;
+     array_unshift($form['#submit'], 'salesforcewebform_form_component_submit');
    }
  }
  }
+ 
+function salesforcewebform_form_component_submit(&$form,&$form_state){
+  if (!empty($form_state['values']['advanced']['form_key'])){
+    $form_state['values']['form_key'] = $form_state['values']['advanced']['form_key'];
+  }
+}
 
 /**
  * Intercept operations on the webform node to assure that the SalesForce fields are tracked.
  */
-function salesforcewebform_nodeapi(&$node, $op, $form = NULL, $page = NULL) {  
+function salesforcewebform_nodeapi(&$node, $op, $form = NULL, $page = NULL) {
  if ( $node->type == 'webform') {
 
    switch ($op) {