diff --git a/src/auth/groupAssignments.ts b/src/auth/groupAssignments.ts
index d798d74..8788dda 100644
--- a/src/auth/groupAssignments.ts
+++ b/src/auth/groupAssignments.ts
@@ -1,4 +1,3 @@
-import validator from 'validator'
 import {
   IUserInfo,
   requestGroups,
@@ -14,10 +13,6 @@ export async function assignUserToGroups(userInfo: IUserInfo): Promise<IUserInfo
     return userInfo
   }
 
-  if (!validator.isEmail(userInfo.email)) {
-    return userInfo
-  }
-
   const settings = await getSettings()
   const domainGroups = settings.domain_groups
   const autoDomainGroups = settings.auto_domain_groups
@@ -36,11 +31,7 @@ export async function assignUserToGroups(userInfo: IUserInfo): Promise<IUserInfo
   )
 
   const sessionGroups = userInfo.groups
-  const parsedDomains = userInfo.email.split('@')
-  const emailDomain = parsedDomains[parsedDomains.length - 1]?.toLowerCase()
-  const emailDomainGroups = assignGroups.filter(
-    (dg) => emailDomain === dg.domain.toLowerCase()
-  )
+  const emailDomainGroups = assignGroups.filter((dg) => userInfo.email.endsWith(dg.domain))
   const groupAssignments = uniq(flatten(emailDomainGroups.map(({ groups }) => groups)))
   const assignToGroups = difference(groupAssignments, sessionGroups)