Bug 1021861 - Use avatar and username attributes