diff --git a/src/Service/UserService.php b/src/Service/UserService.php
index eaa7c8a..24efe6a 100644
--- a/src/Service/UserService.php
+++ b/src/Service/UserService.php
@@ -20,7 +20,7 @@ class UserService
         $nval = \strtolower($value);
 
         // If email remove provider
-        $nval = \preg_replace('/@.*[\.-](com|net|org|es)/', '', $nval);
+        $nval = preg_replace('/@[A-Za-z0-9.-]+\.[A-Za-z]{2,}$/', '', $nval);
 
         // Replace known subs
         $nval = \str_replace(['&', '@', 'ñ', '=', '≠'], ['and', 'at', 'nn', 'eq', 'nq'], $nval);