diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index 81febee9b..4601e7092 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -1092,7 +1092,8 @@ class AttributeEmailAddress extends AttributeString
 {
 	public function GetValidationPattern()
 	{
-		return "^([0-9a-zA-Z]([-.\\w]*[0-9a-zA-Z])*@([0-9a-zA-Z][-\\w]*[0-9a-zA-Z]\\.)+[a-zA-Z]{2,9})$";
+		// return "^([0-9a-zA-Z]([-.\\w]*[0-9a-zA-Z])*@([0-9a-zA-Z][-\\w]*[0-9a-zA-Z]\\.)+[a-zA-Z]{2,9})$";
+		return "^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$";
 	}
 
 	public function GetAsHTML($sValue)