fix UserSwitching