Login: Fix suspicious mail back to enter email cycle (#91409)

* Change link back

* Switch to use query params

* Fix if

client/blocks/login/index.jsx

@@ -177,6 +177,7 @@ class Login extends Component {
 				twoFactorAuthType: 'link',
 				oauth2ClientId: this.props.currentQuery?.client_id,
 				redirectTo: this.props.currentQuery?.redirect_to,
+				usernameOnly: true,
 			} );
 
 			page( magicLoginUrl );

client/blocks/login/login-form.jsx

@@ -598,6 +598,10 @@ export class LoginForm extends Component {
 			return this.props.translate( 'Your email address or username' );
 		}
 
+		if ( this.props.currentQuery?.username_only === 'true' ) {
+			return this.props.translate( 'Your username' );
+		}
+
 		return this.isPasswordView() ? (
 			this.renderChangeUsername()
 		) : (

client/lib/paths/login/index.js

@@ -39,6 +39,7 @@ export function login( {
 	isPartnerSignup = undefined,
 	action = undefined,
 	lostpasswordFlow = undefined,
+	usernameOnly = undefined,
 } = {} ) {
 	let url = '/log-in';
 
@@ -106,5 +107,9 @@ export function login( {
 		url = addQueryArgs( { lostpassword_flow: true }, url );
 	}
 
+	if ( usernameOnly ) {
+		url = addQueryArgs( { username_only: true }, url );
+	}
+
 	return url;
 }

client/login/magic-login/index.jsx

@@ -128,13 +128,14 @@ class MagicLogin extends Component {
 			locale: this.props.locale,
 			emailAddress: this.props.query?.email_address,
 			signupUrl: this.props.query?.signup_url,
+			usernameOnly: true,
 		};
 
 		page( login( loginParameters ) );
 	};
 
 	renderLinks() {
-		const { isJetpackLogin, locale, showCheckYourEmail, translate, isWoo } = this.props;
+		const { isJetpackLogin, locale, showCheckYourEmail, translate, isWoo, query } = this.props;
 
 		if ( isWoo ) {
 			return null;
@@ -152,7 +153,7 @@ class MagicLogin extends Component {
 				/>
 			);
 		}
-		if ( this.props.query?.client_id ) {
+		if ( query?.client_id ) {
 			return null;
 		}
 
@@ -166,11 +167,16 @@ class MagicLogin extends Component {
 			signupUrl: this.props.query?.signup_url,
 		};
 
+		let linkBack = translate( 'Enter a password instead' );
+		if ( query?.username_only === 'true' ) {
+			linkBack = translate( 'Use username and password instead' );
+		}
+
 		return (
 			<>
 				<div className="magic-login__footer">
 					<a href={ login( loginParameters ) } onClick={ this.onClickEnterPasswordInstead }>
-						{ translate( 'Enter a password instead' ) }
+						{ linkBack }
 					</a>
 				</div>
 				<AppPromo