Fix bug where payment method account ID was not being stored