Added email validation, not tested yet