Reapply fix for highlighting users belonging to guilds

removed in ce4e7a2fc8.