Issue #22457:populate customerpn if matching cust or no cust defined