Fix for issue #1 to work with most recent version of User Switching plugin