diff --git a/wp-blog-header.php b/wp-blog-header.php
index b968a6fb2e..bfcaaa6322 100644
--- a/wp-blog-header.php
+++ b/wp-blog-header.php
@@ -271,8 +271,7 @@ if ('' != $category_name) {
 }
 
 // author stuff
-$auteurs = $wpdb->get_results("SELECT * FROM $tableusers WHERE 1=1");
-foreach ($auteurs as $auteur) {
+foreach ($users as $auteur) {
     $cache_authors[$auteur->ID] = $auteur;
 }
 
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 782f1d09d1..6b32330687 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -175,8 +175,8 @@ function get_currentuserinfo() { // a bit like get_userdata(), on steroids
 }
 
 function get_userdata($userid) {
-	global $wpdb, $cache_userdata, $tableusers;
-	if ( empty($cache_userdata[$userid]) ) {
+	global $wpdb, $cache_authors, $tableusers;
+	if ( empty($cache_authors[$userid]) ) {
 		$user = $wpdb->get_row("SELECT * FROM $tableusers WHERE ID = '$userid'");
         $user->user_nickname = stripslashes($user->user_nickname);
         $user->user_firstname = stripslashes($user->user_firstname);
diff --git a/wp-settings.php b/wp-settings.php
index ce1c07cf8a..4bcaf85c83 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -28,7 +28,8 @@ define('WPINC', 'wp-includes');
 require_once (ABSPATH . WPINC . '/wp-db.php');
 
 $wpdb->hide_errors();
-if (!$wpdb->get_row("SELECT * FROM $tableusers LIMIT 1") && !strstr($_SERVER['REQUEST_URI'], 'install.php')) {
+$users = $wpdb->get_results("SELECT * FROM $tableusers");
+if (!$users && !strstr($_SERVER['REQUEST_URI'], 'install.php')) {
 	die("It doesn't look like you've installed WP yet. Try running <a href='wp-admin/install.php'>install.php</a>.");
 }
 $wpdb->show_errors();