Added e-mail validation check