diff --git a/src/wp-admin/includes/privacy-tools.php b/src/wp-admin/includes/privacy-tools.php
index 8b78752a85..52b25b64c9 100644
--- a/src/wp-admin/includes/privacy-tools.php
+++ b/src/wp-admin/includes/privacy-tools.php
@@ -138,8 +138,18 @@ function _wp_personal_data_handle_actions() {
 					} else {
 						$email_address = $user->user_email;
 					}
-				} else {
-					$email_address = $username_or_email_address;
+				} elseif ( is_email( $username_or_email_address ) ) {
+					$user = get_user_by( 'email', $username_or_email_address );
+					if ( ! $user instanceof WP_User ) {
+						add_settings_error(
+							'username_or_email_for_privacy_request',
+							'username_or_email_for_privacy_request',
+							__( 'Unable to add this request. A valid email address or username must be supplied.' ),
+							'error'
+						);
+					} else {
+						$email_address = $user->user_email;
+					}
 				}
 
 				if ( empty( $email_address ) ) {