Change email validation to support Hotmail '_' and '-' before '@'