diff --git a/modules/admin/templates/authsource_list.twig b/modules/admin/templates/authsource_list.twig
index 6a40aca0a4365e6026068a0e71b2eff36f6bf0e6..a5e731ab216971f64872bde3fd3d560c162a91fb 100644
--- a/modules/admin/templates/authsource_list.twig
+++ b/modules/admin/templates/authsource_list.twig
@@ -8,7 +8,7 @@
     <h2>{{ pagetitle }} </h2>
     <ul>
     {% for key, name in sources %}
-        <li><a href="test/{{ name|escape('url') }}">{{ name }}</a></li>
+        <li><a href="{{ moduleURL('admin/test/' ~ name|escape('url')) }}">{{ name }}</a></li>
     {% endfor %}
     </ul>
 {% endblock %}
diff --git a/modules/admin/templates/federation.twig b/modules/admin/templates/federation.twig
index d9059ae761cc39b4e6eeeab39137a285607fc87f..ba5e8a8309155f2ccfb37b88d92b73b778d94f1b 100644
--- a/modules/admin/templates/federation.twig
+++ b/modules/admin/templates/federation.twig
@@ -105,7 +105,7 @@
       <ul>
       {% for entityid, entity in set %}
 
-        <li><a href="federation/show{{ ('?entityid=' ~ (entity.entityid|url_encode) ~ '&set=' ~ key) }}">
+        <li><a href="{{ moduleURL('admin/federation/show?entityid=' ~ (entity.entityid|url_encode) ~ '&set=' ~ key) }}">
           {%- if entity.name_translated -%}
 
           {{ entity.name_translated }}
@@ -142,7 +142,7 @@
       {%- endfor %}
 
     </ul>
-    <form action="federation/show" method="get" class="pure-form">
+    <form action="{{ moduleURL('federation/show') }}" method="get" class="pure-form">
       <fieldset class="fancyfieldset">
         <legend>{% trans %}Look up metadata for entity:{% endtrans %}</legend>
         <select name="set">
diff --git a/modules/admin/templates/show_metadata.twig b/modules/admin/templates/show_metadata.twig
index ca51cca1cc41490a346a916e2f37244601f55531..24fdc3ea9235150343e333eebe5b1793382106d4 100644
--- a/modules/admin/templates/show_metadata.twig
+++ b/modules/admin/templates/show_metadata.twig
@@ -13,6 +13,6 @@
         </div>
     </div>
     <div class="center">
-        <a href="../federation" class="pure-button pure-button-red">{{ 'Back'|trans }}</a>
+        <a href="{{ moduleURL('admin/federation') }}" class="pure-button pure-button-red">{{ 'Back'|trans }}</a>
     </div>
 {% endblock content %}
diff --git a/modules/core/templates/authsource_list.twig b/modules/core/templates/authsource_list.twig
index a3654e915d7d3083aa025d15f7fb29cedba5bf10..f653ad138302c418d30e2724bcdfbab39fb1ccc7 100644
--- a/modules/core/templates/authsource_list.twig
+++ b/modules/core/templates/authsource_list.twig
@@ -5,7 +5,7 @@
     <h2>{{ pagetitle }} </h2>
     <ul>
     {% for key, name in sources %}
-        <li><a href="?as={{ name|escape('url') }}">{{ name }}</a></li>
+        <li><a href="{{ moduleURL('core/login/' ~ name|escape('url')) }}">{{ name }}</a></li>
     {% endfor %}
     </ul>
 {% endblock %}
diff --git a/modules/core/templates/login.twig b/modules/core/templates/login.twig
index 2e60b4aa1a8573759674fecfd94a2daa50a3f10e..cd5b71cdeb0ea83f6ca689b5094d376f0ef6bfee 100644
--- a/modules/core/templates/login.twig
+++ b/modules/core/templates/login.twig
@@ -13,7 +13,7 @@
         <ul class="pure-menu-list auth_methods">
             {% for id, config in sources -%}
                 <li class="pure-menu-item">
-                    <a href="{{ moduleURL('core/login/' ~ id|url_encode ) }}" class="pure-menu-link">
+                    <a href="{{ moduleURL('core/login/' ~ id|url_encode) }}" class="pure-menu-link">
                       {{ config.name|translateFromArray|default(id) }}
                     </a>
                 </li>