Fixed issues with using the system as an invited user