Fix issue with the intial payment ID of a customer not getting stored. #2256