Refactored new/invited user