[CLC-2705] Switching between users you act as is cumbersome

https://jira.media.berkeley.edu/jira/browse/CLC-2705