Correctly handle existing team choice (fixes GH-720)