Update
Fix email and validation