Fix for switch users and projects add-on