diff --git a/wp-includes/registration.php b/wp-includes/registration.php
index f66441edd..f2a00e9a5 100644
--- a/wp-includes/registration.php
+++ b/wp-includes/registration.php
@@ -102,7 +102,7 @@ function wp_insert_user($userdata) {
 	update_usermeta( $user_id, 'aim', $aim );
 	update_usermeta( $user_id, 'yim', $yim );
 
-	if ( $update ) {
+	if ( $update && isset($role) ) {
 		$user = new WP_User($user_id);
 		$user->set_role($role);
 	}