And fixed url compat again with new email.html template