--- modules/user/user.module	2007-03-21 13:11:52.000000000 -0400
+++ modules/user/user.module	2007-03-21 13:11:25.000000000 -0400
@@ -916,7 +916,7 @@
 }
 
 function user_login_validate($form_id, $form_values) {
-  if ($form_values['name']) {
+  if (!form_get_errors() && $form_values['name']) {
     if (user_is_blocked($form_values['name'])) {
       // blocked in user administration
       form_set_error('login', t('The username %name has not been activated or is blocked.', array('%name' => $form_values['name'])));