ITTE-943 - Email validotor small fixes.