diff --git a/Client/src/Components/Check/Check.jsx b/Client/src/Components/Check/Check.jsx
index 9c1ec57fb..01a023345 100644
--- a/Client/src/Components/Check/Check.jsx
+++ b/Client/src/Components/Check/Check.jsx
@@ -54,7 +54,8 @@ const Check = ({ text, noHighlightText, variant = "info", outlined = false }) =>
 					opacity: 0.8,
 				}}
 			>
-				<Typography component="span">{noHighlightText}</Typography> {text}
+				{noHighlightText && <Typography component="span">{noHighlightText}</Typography>}{" "}
+				{text}
 			</Typography>
 		</Stack>
 	);
diff --git a/Client/src/Pages/Auth/SetNewPassword.jsx b/Client/src/Pages/Auth/SetNewPassword.jsx
index 92d6973f1..77e621acd 100644
--- a/Client/src/Pages/Auth/SetNewPassword.jsx
+++ b/Client/src/Pages/Auth/SetNewPassword.jsx
@@ -52,7 +52,9 @@ const SetNewPassword = () => {
 					body: "Your password was reset successfully.",
 				});
 			} else {
-				const errorMessage = action.payload ? action.payload.msg : "Unknown error";
+				const errorMessage = action.payload
+					? action.payload.msg
+					: "Unable to reset password. Please try again later or contact support.";
 				createToast({
 					body: errorMessage,
 				});