Ship to address on PO form

I recently used the PO feature and found that the process auto populated my clients home address as the ship to. In this case we needed the ship to location to be "will call" at the distributors warehouse. The only way I could do this is to find the address to the warehouse and add in notes "will call to warehouse". The note ended up as the only item on the second page. My concern is the auto fill in this very important information may get overlooked to change it out and the will call note will be missed all by itself on the second page. That address really should not auto populate! community thoughts?