diff --git a/public/mpog-user-validations.js b/public/mpog-user-validations.js
index 3d2bd63..a35567c 100644
--- a/public/mpog-user-validations.js
+++ b/public/mpog-user-validations.js
@@ -220,7 +220,7 @@
       return false;
     }
 
-    var correct_format_regex = new RegExp(/^\w+@[a-zA-Z_]+?\.[a-zA-Z]{2,3}$/);
+    var correct_format_regex = new RegExp(/\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i);
 
     return !correct_format_regex.test(value);
   }
--
libgit2 0.21.2