Fixed validator issue with email fields