diff --git a/src/App.svelte b/src/App.svelte
index fa1ce31..0f14f31 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -30,7 +30,7 @@
 
 	<!-- MagicCodeVerificationPage (OTP)
 	OTP verification page for authenticating with a magic code -->
-	<Route path="/verify-magic-code/:id" component={VerifyMagicCode} />
+	<Route path="/verify-magic-code/:id/:name" component={VerifyMagicCode} />
 
 	<!-- EmailEntryPage
 	Page where the user enters their email, redirecting to login or registration based on context -->
diff --git a/src/lib/utils/validation.ts b/src/lib/utils/validation.ts
index 83e775f..cc4980b 100644
--- a/src/lib/utils/validation.ts
+++ b/src/lib/utils/validation.ts
@@ -2,6 +2,7 @@ import * as yup from 'yup';
 const emailRegex = /^([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]+)$/;
 const firstNameRegex = /^[A-Za-z\s]+$/;
 const lastNameRegex = /^[A-Za-z\s]*$/;
+const firstNameSpaceCheck = /^[^\s].*$/;
 
 //----------------------------- Check Validation ---------------------//
 export const checkValidation = async (validationSchema, val) => {
@@ -25,7 +26,11 @@ export const registrationSchema = yup.object().shape({
 		.email()
 		.matches(emailRegex, 'Please enter a valid Email ID')
 		.required('Please enter a valid Email ID'),
-	firstName: yup.string().trim().matches(firstNameRegex, "Your first name cannot have numbers or special characters.").required('Please enter your first name.'),
+	firstName:yup
+	 .string()
+	 .matches(firstNameRegex, "Your first name cannot have numbers or special characters.")
+	 .matches(firstNameSpaceCheck , 'Your first name cannot start with spaces.')
+	 .required('Please enter your first name.'),
 	lastName: yup.string().matches(lastNameRegex, "Your last name cannot have numbers or special characters."),
 	password: yup
 		.string()
diff --git a/src/pages/Auth/entry-point/EntryPoint.svelte b/src/pages/Auth/entry-point/EntryPoint.svelte
index 8740c8e..e6639a6 100644
--- a/src/pages/Auth/entry-point/EntryPoint.svelte
+++ b/src/pages/Auth/entry-point/EntryPoint.svelte
@@ -81,7 +81,7 @@
 		try {
 			const magicCodeResponse = await sendMagicCodeEmail({ email });
 			if (magicCodeResponse.isSuccessful) {
-				navigate(`/verify-magic-code/${email}`); // Updated this line
+				navigate(`/verify-magic-code/${email}/${magicCodeResponse.data}`); // Updated this line
 			} else {
 				if (magicCodeResponse?.message === 'Cooldown Active') {
 					navigate('/cool-down-active');
diff --git a/src/pages/Auth/login-page/LoginPage.svelte b/src/pages/Auth/login-page/LoginPage.svelte
index f241653..3ebaaf3 100644
--- a/src/pages/Auth/login-page/LoginPage.svelte
+++ b/src/pages/Auth/login-page/LoginPage.svelte
@@ -242,7 +242,7 @@
 				</div>
 
 				{#if validationErrors?.password && isPasswordTouched}
-					<small class="form-text text-dangerColor">{validationErrors?.password}</small>
+					<small class="form-text text-dangerColor ">{validationErrors?.password}</small>
 				{:else if authenticationError}
 					<small class="form-text text-dangerColor"
 						>The email and password combination you entered appears to be incorrect. Please try