Avatars weren't in a proper order in the roster.

Description

For example, in the attached file, Marty has the Matt' avatar.

Environment

None
Fixed

Assignee

David Smith

Reporter

Francisco Vives