Better way to get payment accounts (bug 969041)