Added e-mail validation