Ensure payment details are set

The proposed patch is attached.

Further changes were required, a new patch is attached.

This update stemmed from changes made in a custom version of this module we used in one of our projects. The changes are more extensive and the focus is wider that described in this issue so this issue will be replaced by a more appropriate one. This ticket is now considered closed.