Issues/147 secure link where appropriate