diff --git a/src/wp-admin/includes/privacy-tools.php b/src/wp-admin/includes/privacy-tools.php
index 2e4589d6d2..f038f37b10 100644
--- a/src/wp-admin/includes/privacy-tools.php
+++ b/src/wp-admin/includes/privacy-tools.php
@@ -121,20 +121,17 @@ function _wp_personal_data_handle_actions() {
 					);
 				}
 
-				if ( ! is_email( $username_or_email_address ) ) {
-					$user = get_user_by( 'login', $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;
-					}
+				$field_type = is_email( $username_or_email_address ) ? 'email' : 'login';
+				$user = get_user_by( $field_type, $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 = $username_or_email_address;
+					$email_address = $user->user_email;
 				}
 
 				if ( empty( $email_address ) ) {