Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.8
diff -u -F^f -r1.8 form.inc
--- includes/form.inc	29 Oct 2005 07:00:33 -0000	1.8
+++ includes/form.inc	1 Nov 2005 01:12:47 -0000
@@ -233,7 +237,7 @@ function _form_builder($form) {
       $ref =& $ref[$parent];
     }
     if (!isset($form['#value'])) {
-      $form['#value'] = ($posted && isset($edit)) ? $edit : $form['#default_value'];
+      $form['#value'] = ($posted && (isset($edit) || !isset($edit['#return_value']))) ? $edit : $form['#default_value'];
     }
     if (isset($form['#execute'])) {
       if ($_POST[$form['#name']] == $form['#value']) {