diff --git a/app/utils.py b/app/utils.py
index b3f57fdf5..9874e1ec7 100644
--- a/app/utils.py
+++ b/app/utils.py
@@ -466,9 +466,12 @@ class GovernmentDomain:
 
         def fn(domain):
 
-            return (email_address_or_domain == domain) or re.search(
-                "[\.|@]({})$".format(domain.replace(".", "\.")),
-                email_address_or_domain
+            return (
+                email_address_or_domain == domain
+            ) or (
+                email_address_or_domain.endswith("@{}".format(domain))
+            ) or (
+                email_address_or_domain.endswith(".{}".format(domain))
             )
 
         return fn