diff --git a/src/dashboards/Student.tsx b/src/dashboards/Student.tsx
index 97acd6d1..f55bf16e 100644
--- a/src/dashboards/Student.tsx
+++ b/src/dashboards/Student.tsx
@@ -42,7 +42,7 @@ export default function StudentDashboard({user}: Props) {
 	const setAssignment = useExamStore((state) => state.setAssignment);
 
 	useEffect(() => {
-		getUserCorporate(user.id).then(setCorporateUserToShow);
+		getUserCorporate("IXdh9EQziAVXXh0jOiC5cPVlgS82").then(setCorporateUserToShow);
 	}, [user]);
 
 	const startAssignment = (assignment: Assignment) => {
@@ -70,7 +70,7 @@ export default function StudentDashboard({user}: Props) {
 		<>
 			{corporateUserToShow && (
 				<div className="absolute top-4 right-4 bg-neutral-200 px-2 rounded-lg py-1">
-					Linked to: <b>{corporateUserToShow?.corporateInformation.companyInformation.name || corporateUserToShow.name}</b>
+					Linked to: <b>{corporateUserToShow?.corporateInformation?.companyInformation.name || corporateUserToShow.name}</b>
 				</div>
 			)}
 			<ProfileSummary
diff --git a/src/dashboards/Teacher.tsx b/src/dashboards/Teacher.tsx
index e7b13e10..be616639 100644
--- a/src/dashboards/Teacher.tsx
+++ b/src/dashboards/Teacher.tsx
@@ -244,7 +244,7 @@ export default function TeacherDashboard({user}: Props) {
 		<>
 			{corporateUserToShow && (
 				<div className="absolute top-4 right-4 bg-neutral-200 px-2 rounded-lg py-1">
-					Linked to: <b>{corporateUserToShow?.corporateInformation.companyInformation.name || corporateUserToShow.name}</b>
+					Linked to: <b>{corporateUserToShow?.corporateInformation?.companyInformation.name || corporateUserToShow.name}</b>
 				</div>
 			)}
 			<section
diff --git a/src/pages/(admin)/BatchCodeGenerator.tsx b/src/pages/(admin)/BatchCodeGenerator.tsx
index e03cad7a..4eb1ece0 100644
--- a/src/pages/(admin)/BatchCodeGenerator.tsx
+++ b/src/pages/(admin)/BatchCodeGenerator.tsx
@@ -65,7 +65,7 @@ export default function BatchCodeGenerator({user}: {user: User}) {
 							return EMAIL_REGEX.test(email) && !users.map((u) => u.email).includes(email)
 								? {
 										email: email.toString(),
-										name: `${firstName} ${lastName}`,
+										name: `${firstName ?? ""} ${lastName ?? ""}`.trim(),
 										passport_id: passport_id.toString(),
 								  }
 								: undefined;
diff --git a/src/utils/groups.ts b/src/utils/groups.ts
index 0d0dec55..44f63fe7 100644
--- a/src/utils/groups.ts
+++ b/src/utils/groups.ts
@@ -14,5 +14,5 @@ export const getUserCorporate = async (userID: string) => {
 	const users = (await axios.get<User[]>("/api/users/list")).data;
 
 	const admins = groups.map((g) => users.find((u) => u.id === g.admin));
-	return admins.map((x) => x?.type).includes("corporate") ? (admins[0] as CorporateUser) : undefined;
+	return admins.filter((x) => x?.type === "admin") ? (admins[0] as CorporateUser) : undefined;
 };