diff --git a/src/components/views/donate/QFToast.tsx b/src/components/views/donate/QFToast.tsx
index ccb80fb040..e250599459 100644
--- a/src/components/views/donate/QFToast.tsx
+++ b/src/components/views/donate/QFToast.tsx
@@ -3,7 +3,6 @@ import {
 	Button,
 	Caption,
 	IconExternalLink16,
-	IconPassport24,
 	neutralColors,
 	P,
 	semanticColors,
@@ -15,13 +14,12 @@ import Routes from '@/lib/constants/Routes';
 import InternalLink from '@/components/InternalLink';
 
 const QFToast = () => {
+	const { formatMessage, locale } = useIntl();
 	const { info } = usePassport();
 	const { qfEligibilityState, currentRound } = info;
 
 	const isEligible = qfEligibilityState === EQFElegibilityState.ELIGIBLE;
 
-	const { formatMessage, locale } = useIntl();
-
 	const color = isEligible
 		? semanticColors.jade['500']
 		: semanticColors.golden['700'];
@@ -70,19 +68,18 @@ const QFToast = () => {
 	return (
 		<Wrapper color={color}>
 			<Title $medium color={color}>
-				{!isEligible && <IconPassport24 />}
 				{title}
 			</Title>
 			<Description>{description}</Description>
 			<FlexCenter>
 				<InternalLink
-					href={isEligible ? Routes.QFProjects : Routes.Passport}
+					href={isEligible ? Routes.QFProjects : Routes.QFElegibility}
 				>
 					<Button
 						label={formatMessage({
 							id: isEligible
 								? 'label.go_to_projects'
-								: 'label.passport.link.go_to_passport',
+								: 'qf_donor_eligibility.banner.link.check_eligibility',
 						})}
 						buttonType='primary'
 						size='small'
@@ -96,6 +93,7 @@ const QFToast = () => {
 
 const Description = styled(P)`
 	color: ${neutralColors.gray[800]};
+	white-space: pre-line;
 	margin: 16px 0;
 	> span {
 		font-weight: 500;
@@ -106,7 +104,6 @@ const Title = styled(Caption)<{ color: string }>`
 	color: ${props => props.color};
 	display: flex;
 	align-items: center;
-	gap: 8px;
 `;
 
 const Wrapper = styled.div<{ color: string }>`
diff --git a/src/components/views/donate/SuccessView.tsx b/src/components/views/donate/SuccessView.tsx
index 78a48a4219..95137ad162 100644
--- a/src/components/views/donate/SuccessView.tsx
+++ b/src/components/views/donate/SuccessView.tsx
@@ -89,6 +89,18 @@ export const SuccessView: FC = () => {
 		? EContentType.justDonatedRecurring
 		: EContentType.justDonated;
 
+	const showQFToast =
+		!excludeFromQF &&
+		!isSafeEnv &&
+		hasActiveQFRound &&
+		isOnEligibleNetworks &&
+		passportState !== EPassportState.CONNECTING &&
+		passportState !== EPassportState.LOADING_SCORE &&
+		qfEligibilityState !== EQFElegibilityState.LOADING &&
+		qfEligibilityState !== EQFElegibilityState.PROCESSING &&
+		qfEligibilityState !== EQFElegibilityState.NOT_CONNECTED &&
+		qfEligibilityState !== EQFElegibilityState.ERROR;
+
 	return (
 		<Wrapper>
 			<Row>
@@ -136,16 +148,7 @@ export const SuccessView: FC = () => {
 								<br />
 							</>
 						)}
-						{!excludeFromQF &&
-							!isSafeEnv &&
-							hasActiveQFRound &&
-							passportState !== EPassportState.LOADING_SCORE &&
-							passportState !== EPassportState.CONNECTING &&
-							qfEligibilityState !==
-								EQFElegibilityState.LOADING &&
-							qfEligibilityState !==
-								EQFElegibilityState.PROCESSING &&
-							isOnEligibleNetworks && <QFToast />}
+						{showQFToast && <QFToast />}
 						{isRecurring && <ManageRecurringDonation />}
 						<SocialBoxWrapper>
 							<SocialBox
diff --git a/src/hooks/usePassport.ts b/src/hooks/usePassport.ts
index 157e82d74b..e4fc810f54 100644
--- a/src/hooks/usePassport.ts
+++ b/src/hooks/usePassport.ts
@@ -268,7 +268,7 @@ export const usePassport = () => {
 			passportState: EPassportState.CONNECTING,
 			passportScore: null,
 			activeQFMBDScore: null,
-			currentRound: info.currentRound,
+			currentRound: activeQFRound,
 		});
 
 		const passports = getPassports();
@@ -284,7 +284,7 @@ export const usePassport = () => {
 					passportState: EPassportState.NOT_SIGNED,
 					passportScore: null,
 					activeQFMBDScore: null,
-					currentRound: info.currentRound,
+					currentRound: activeQFRound,
 				});
 			}
 		}
@@ -331,7 +331,7 @@ export const usePassport = () => {
 						passportState: EPassportState.NOT_SIGNED,
 						passportScore: null,
 						activeQFMBDScore: null,
-						currentRound: info.currentRound,
+						currentRound: activeQFRound,
 					});
 				}
 			} else {
diff --git a/src/lib/constants/Routes.ts b/src/lib/constants/Routes.ts
index 9b2e7f75a3..4172bd4f8f 100644
--- a/src/lib/constants/Routes.ts
+++ b/src/lib/constants/Routes.ts
@@ -64,7 +64,7 @@ const Routes = {
 	HowToBuyXdai: '/how-to-buy-xdai',
 	PurchaseXdai: '/purchase-xdai',
 	Referral: '/referral',
-	Passport: '/passport',
+	QFElegibility: '/qf-eligibility',
 };
 
 export default Routes;