Eve/Chris If we have not come from payment page then show shipping options in PayPal and save user details on return from PayPal