Fix the auto-team options.
Merge pull request #4116 from pchote/lobby-fix

Fix the auto-team options.