diff --git a/includes/form.inc b/includes/form.inc
index ab04bbcc962b915c2c41b641e7eda462d1f60d50..2d13ed1424a4b40ffe8ce0b73109f503ccf60e52 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -68,9 +68,9 @@ function drupal_get_form($form_id, &$form, $callback = NULL) {
       variable_set('drupal_private_key', mt_rand());
     }
 
-    $form['form_token'] = array('#type' => 'hidden', '#value' => md5(session_id() . $form['#token'] . variable_get('drupal_private_key', '')));
+    $form['form_token'] = array('#type' => 'hidden', '#default_value' => md5(session_id() . $form['#token'] . variable_get('drupal_private_key', '')));
   }
-  $form['form_id'] = array('#type' => 'hidden', '#default_value' => $form_id);
+  $form['form_id'] = array('#type' => 'hidden', '#value' => $form_id);
 
   $form = array_merge(_element_info('form'), $form);