diff --git a/src/pages/(admin)/BatchCodeGenerator.tsx b/src/pages/(admin)/BatchCodeGenerator.tsx
index 211fdc4f..5a0ba531 100644
--- a/src/pages/(admin)/BatchCodeGenerator.tsx
+++ b/src/pages/(admin)/BatchCodeGenerator.tsx
@@ -49,7 +49,7 @@ export default function BatchCodeGenerator({user}: {user: User}) {
 				const information = uniqBy(
 					rows
 						.map((row) => {
-							const [firstName, lastName, country, passport_id, email, phone] = row.map((x) => (x as string).trim());
+							const [firstName, lastName, country, passport_id, email, phone] = row as string[];
 							return EMAIL_REGEX.test(email) && !users.map((u) => u.email).includes(email)
 								? {
 										email,
diff --git a/src/pages/api/code/index.ts b/src/pages/api/code/index.ts
index 85eea987..2e315cb6 100644
--- a/src/pages/api/code/index.ts
+++ b/src/pages/api/code/index.ts
@@ -54,7 +54,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 
 		if (infos && infos.length > index) {
 			const {email, name, passport_id} = infos[index];
-			await setDoc(codeRef, {email, name, passport_id}, {merge: true});
+			await setDoc(codeRef, {email: email.trim(), name: name.trim(), passport_id: passport_id.trim()}, {merge: true});
 
 			const transport = prepareMailer();
 			const mailOptions = prepareMailOptions(
@@ -62,7 +62,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 					type,
 					code,
 				},
-				[email],
+				[email.trim()],
 				"EnCoach Registration",
 				"main",
 			);