Compatibility with User Switching 0.8