cleanup the invitation() & add email validation