Fix to work with most recent version of User Switching plugin