Corrects shipping and billing address options

The last implementation overwrote the user data entirely. Additionally
the interface has been made a little clearer.