issue #19131: Fix some issuses relating to creating customers.
Merge pull request #449 from jrogelstad/master

issue #19131: Misc. fixes.