Index: profiles/expert/expert.profile
===================================================================
RCS file: /cvs/drupal/drupal/profiles/expert/expert.profile,v
retrieving revision 1.1
diff -u -r1.1 expert.profile
--- profiles/expert/expert.profile	5 Jul 2008 10:58:12 -0000	1.1
+++ profiles/expert/expert.profile	16 Sep 2008 03:53:48 -0000
@@ -8,7 +8,7 @@
  *   An array of modules to enable.
  */
 function expert_profile_modules() {
-  return array('dblog');
+  return array('dblog', 'views');
 }
 
 /**
Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.282
diff -u -r1.282 form.inc
--- includes/form.inc	6 Sep 2008 08:36:19 -0000	1.282
+++ includes/form.inc	16 Sep 2008 03:53:47 -0000
@@ -139,8 +139,8 @@
   // the form, passing in the latest $form_state in addition to any
   // other variables passed into drupal_get_form().
 
-  if (!empty($form_state['rebuild']) || !empty($form_state['storage'])) {
-    $form = drupal_rebuild_form($form_id, $form_state, $args);
+  if ((!empty($form_state['rebuild']) || !empty($form_state['storage'])) && !form_get_errors()) {
+      $form = drupal_rebuild_form($form_id, $form_state, $args);
   }
 
   // If we haven't redirected to a new location by now, we want to