In the former case, should probably include the username as well as the avatar. In the latter case, should also include a username.