Change confirmation to include correct address for retrieval