diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index 4a304634d43..5d7a13d74b9 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -144,7 +144,7 @@ function poll_form($node, $form_values = NULL) {
 
   $form['choices'] = array(
     '#type' => 'hidden',
-    '#default_value' => $choices,
+    '#value' => $choices,
   );
 
   // Poll choices
@@ -163,7 +163,7 @@ function poll_form($node, $form_values = NULL) {
     '#type' => 'checkbox',
     '#parents' => array('morechoices'),
     '#title' => t('Need more choices'),
-    '#default_value' => 0,
+    '#value' => 0,
     '#description' => t("If the amount of boxes above isn't enough, check this box and click the Preview button below to add some more."),
     '#weight' => 1,
   );