Invited User Story & other fixes