Added ability to switch users