the old code assumed that the username was populated in the roster object new code uses the userId which is always populated Former-commit-id: 5fe0f88b3465ba65efabe2a41d1df392c85e041f