diff --git a/wp-includes/user.php b/wp-includes/user.php
index f0cc8c33bd..723d543544 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -1803,7 +1803,7 @@ function wp_insert_user( $userdata ) {
 	}
 
 	if ( $update ) {
-		if ( $user_email !== $old_user_data->user_email ) {
+		if ( $user_email !== $old_user_data->user_email || $user_pass !== $old_user_data->user_pass ) {
 			$data['user_activation_key'] = '';
 		}
 		$wpdb->update( $wpdb->users, $data, compact( 'ID' ) );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b3ab6cb149..e212206b67 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.4.1-RC1-47639';
+$wp_version = '5.4.1-RC1-47640';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.