Index: webform.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/webform.module,v
retrieving revision 1.124.2.46
diff -u -r1.124.2.46 webform.module
--- webform.module	23 Jul 2008 06:02:33 -0000	1.124.2.46
+++ webform.module	24 Jul 2008 00:44:26 -0000
@@ -1580,6 +1580,7 @@
 function webform_client_form_submit($form, &$form_state) {
   global $user, $base_url;
   module_load_include('inc', 'webform', 'webform_submissions');
+  webform_load_components();
 
   $node = node_load(array('nid' => $form_state['values']['details']['nid']));
 
@@ -1608,6 +1609,7 @@
   if (isset($form_state['storage']['submitted'])) {
     // Merge any stored submission data for multistep forms.
     $original_values = is_array($form_state['values']['submitted']) ? $form_state['values']['submitted'] : array();
+    unset($form_state['values']['submitted']);
 
     foreach ($form_state['storage']['submitted'] as $key => $val) {
       $form_state['values']['submitted'][$key] = $val;