Added use of usernames where the user's real name was before