--- includes/form.inc	2009-09-22 07:21:19.000000000 -0700
+++ includes/formNew.inc	2009-09-22 07:28:55.000000000 -0700
@@ -138,7 +138,7 @@ function drupal_get_form($form_id) {
   // in the latest $form_state in addition to any other variables passed
   // into drupal_get_form().
 
-  if ((!empty($form_state['storage']) || !empty($form_state['rebuild'])) && !empty($form_state['submitted']) && !form_get_errors()) {
+  if ((!empty($form_state['storage']) || !empty($form_state['rebuild'])) || (!empty($form_state['submitted']) && !form_get_errors())) {
     $form = drupal_rebuild_form($form_id, $form_state, $args);
   }