Add email validation and password