manage multiple payment accounts (bug 990441, 989946)