Add additional User e-mail validation and testing