Changed to use secure return address if allowed in store config