changed to use username field instead of display name