diff --git a/wp-includes/update.php b/wp-includes/update.php
index 51fbe7e7c..ca0412ff4 100644
--- a/wp-includes/update.php
+++ b/wp-includes/update.php
@@ -44,14 +44,16 @@ function wp_version_check() {
 	else
 		$mysql_version = 'N/A';
 
-	$num_blogs = 1;
-	$wp_install = home_url( '/' );
-	$multisite_enabled = 0;
-	$user_count = count_users( );
 	if ( is_multisite( ) ) {
+		$user_count = get_user_count( );
 		$num_blogs = get_blog_count( );
 		$wp_install = network_site_url( );
 		$multisite_enabled = 1;
+	} else {
+		$user_count = count_users( );
+		$multisite_enabled = 0;
+		$num_blogs = 1;
+		$wp_install = home_url( '/' );
 	}
 
 	$local_package = isset( $wp_local_package )? $wp_local_package : '';