Pull request: #1136 apparently we're still using stuff from legacy templates

Needed to remove the protocol specific parts from the urls

Closes #1136