Improve formatting around username.