Merge "User switcher - Fix broken user addition"