diff --git modules/user/user.module modules/user/user.module
index ea934cc..bf67cb8 100644
--- modules/user/user.module
+++ modules/user/user.module
@@ -1980,7 +1980,6 @@ function user_login_final_validate($form, &$form_state) {
     }
     else {
       form_set_error('name', t('Sorry, unrecognized username or password. <a href="@password">Have you forgotten your password?</a>', array('@password' => url('user/password'))));
-      watchdog('user', 'Login attempt failed for %user.', array('%user' => $form_state['values']['name']));
     }
   }
   elseif (isset($form_state['flood_control_user_identifier'])) {
@@ -2023,6 +2022,9 @@ function user_authenticate($name, $password) {
         }
       }
     }
+    if (!$uid) {
+      watchdog('user', 'Login attempt failed for %user.', array('%user' => $name));
+    }
   }
   return $uid;
 }