I decided it's easier for me to have my own P.O. Box so I can check when I need to (and the key at work kept disappearing...).
My new P.O. Box is 1973. That's the only part different, the rest is all the same. It's updated under Coorespondence too.