I have updated the ticket above. We will keep step 6, where we will indicate to customer current residential address is where we will be sending out correspondence to in future, while keeping the marketing preference on this step. We will also include a remark on Personal Detail step – Current Residential Address, to remind customer this will be used as correspondence address going forward.