fix up user switching
fix up user switching