Bug 1021861 - Use username attribute