Added some more logic around account payment methods.
Fixes bugs around order payments and account payments.