Bug 21801: (follow-up) Use ->account