Index: wp-app.php
===================================================================
--- wp-app.php	(revision 10770)
+++ wp-app.php	(working copy)
@@ -1492,14 +1492,15 @@
 		// If Basic Auth is working...
 		if(isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
 			log_app("Basic Auth",$_SERVER['PHP_AUTH_USER']);
-			$user = wp_authenticate($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
-			if ( $user && !is_wp_error($user) ) {
-				wp_set_current_user($user->ID);
-				log_app("authenticate()", $_SERVER['PHP_AUTH_USER']);
-				return true;
-			}
 		}
 
+		$user = wp_authenticate($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
+		if ( $user && !is_wp_error($user) ) {
+			wp_set_current_user($user->ID);
+			log_app("authenticate()", $user->user_login]);
+			return true;
+		}
+
 		return false;
 	}