Use true issuer address

Fixes #723
We should not have to change the template. We should be updating the issuer to the correct address.