diff --git a/src/pages/api/make_user.ts b/src/pages/api/make_user.ts
index 5d9d7313..ddc483a3 100644
--- a/src/pages/api/make_user.ts
+++ b/src/pages/api/make_user.ts
@@ -122,7 +122,7 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 			}
 
 			if (!!corporate) {
-				const corporateQ = query(collection(db, "users"), where("email", "==", corporate));
+				const corporateQ = query(collection(db, "users"), where("email", "==", corporate.trim().toLowerCase()));
 				const corporateSnapshot = await getDocs(corporateQ);
 
 				if (!corporateSnapshot.empty) {
@@ -146,6 +146,16 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 								participants: [...participants, userId],
 							});
 						}
+					} else {
+						const defaultGroup: Group = {
+							admin: corporateUser.id,
+							id: v4(),
+							name: type === "student" ? "Students" : "Teachers",
+							participants: [userId],
+							disableEditing: true,
+						};
+
+						await setDoc(doc(db, "groups", defaultGroup.id), defaultGroup);
 					}
 				}
 			}