Fix for non-logged in users