[Fix] Email Regex according to #4894 (backport from J3.3.x)