Added CEmailValidator fix