Little payment/accountManager improvement