Further fixes to switching users.