PO Address changing based on client

I believe this is the same issue: