Index: wp-admin/includes/upgrade.php
===================================================================
--- wp-admin/includes/upgrade.php	(revision 40330)
+++ wp-admin/includes/upgrade.php	(working copy)
@@ -86,11 +86,14 @@
 		$message = __('User already exists. Password inherited.');
 	}
 
-	$user = new WP_User($user_id);
-	$user->set_role('administrator');
+    $user = new WP_User( $user_id );
+    $user->set_role( 'administrator' );
+    $user->user_url = $guessurl;
 
-	wp_install_defaults($user_id);
+    wp_update_user( $user );
 
+    wp_install_defaults( $user_id );
+
 	wp_install_maybe_enable_pretty_permalinks();
 
 	flush_rewrite_rules();