diff --git a/wp-admin/includes/privacy-tools.php b/wp-admin/includes/privacy-tools.php
index a22ad40374..6028cb6a3b 100644
--- a/wp-admin/includes/privacy-tools.php
+++ b/wp-admin/includes/privacy-tools.php
@@ -320,11 +320,9 @@ function wp_privacy_generate_personal_data_export_file( $request_id ) {
 		fclose( $file );
 	}
 
-	$stripped_email       = str_replace( '@', '-at-', $email_address );
-	$stripped_email       = sanitize_title( $stripped_email ); // Slugify the email address.
 	$obscura              = wp_generate_password( 32, false, false );
-	$file_basename        = 'wp-personal-data-file-' . $stripped_email . '-' . $obscura;
-	$html_report_filename = $file_basename . '.html';
+	$file_basename        = 'wp-personal-data-file-' . $obscura;
+	$html_report_filename = wp_unique_filename( $exports_dir, $file_basename . '.html' );
 	$html_report_pathname = wp_normalize_path( $exports_dir . $html_report_filename );
 	$file                 = fopen( $html_report_pathname, 'w' );
 	if ( false === $file ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 95024ce5f0..2505788971 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.4-alpha-47143';
+$wp_version = '5.4-alpha-47144';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.