diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index e391e0eb27..26cce2725c 100644
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -19,8 +19,6 @@ nocache_headers();
 
 update_category_cache();
 
-wp_get_current_user();
-
 $posts_per_page = get_option('posts_per_page');
 $what_to_show = get_option('what_to_show');
 $date_format = get_option('date_format');
diff --git a/wp-settings.php b/wp-settings.php
index 84a0f36d5c..f216783bbf 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -438,6 +438,8 @@ function shutdown_action_hook() {
 }
 register_shutdown_function('shutdown_action_hook');
 
+$wp->init();  // Sets up current user.
+
 // Everything is loaded and initialized.
 do_action('init');