--- webform-orig.module	2009-02-19 16:04:49.000000000 -0500
+++ webform.module	2009-02-19 16:07:43.000000000 -0500
@@ -1503,17 +1503,12 @@ function webform_client_form($form_state
         }
 
         $form['details']['page_num'] = array(
-          '#type'      => 'hidden',
+          '#type'      => 'value',
           '#value'     => $page_num,
         );
 
         $form['details']['page_count'] = array(
-          '#type'      => 'hidden',
-          '#value'     => $page_count,
-        );
-
-        $form['details']['page_count'] = array(
-          '#type'      => 'hidden',
+          '#type'      => 'value',
           '#value'     => $page_count,
         );
 
@@ -1563,26 +1558,14 @@ function webform_client_form($form_state
     }
     // Do not display the submit button if this is a preview or submission view.
     if ((!$preview && $enabled)) {
-      // Additional hidden elements.
-      $form['details']['email_subject'] = array(
-        '#type'      => 'hidden',
-        '#value'     => $node->webform['email_subject'],
-      );
-      $form['details']['email_from_name'] = array(
-        '#type'      => 'hidden',
-        '#value'     => $node->webform['email_from_name'],
-      );
-      $form['details']['email_from_address'] = array(
-        '#type'      => 'hidden',
-        '#value'     => $node->webform['email_from_address'],
-      );
+      // Additional elements.
       $form['details']['nid'] = array(
         '#type'      => 'value',
         '#value'     => $node->nid,
       );
       if (isset($submission->sid)) {
         $form['details']['sid'] = array(
-          '#type'      => 'hidden',
+          '#type'      => 'value',
           '#value'     => $submission->sid,
         );
       }