Added email validation stuff