diff --git a/wp-includes/user.php b/wp-includes/user.php
index 8d34d1200..de6d96288 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -238,10 +238,11 @@ function get_user_option( $option, $user = 0, $deprecated = '' ) {
 
 	if ( empty($user) ) {
 		$user = wp_get_current_user();
-	} else {
-		$user = get_userdata($user);
+		$user = $user->ID;
 	}
 
+	$user = get_userdata($user);
+
 	// Keys used as object vars cannot have dashes.
 	$key = str_replace('-', '_', $option);