diff --git a/templates/web/edugain/index.html.tt2 b/templates/web/edugain/index.html.tt2
index 609a17e3597549efed5644b6442be151a137fc67..74a3fad20230c391112882c42ae0d848f199a723 100644
--- a/templates/web/edugain/index.html.tt2
+++ b/templates/web/edugain/index.html.tt2
@@ -45,14 +45,14 @@
                             <span>Language</span>
                             <ul class="et-submenu">
                                 <li class="et-submenu-option">
-                                    <a [% IF l10n.language_tag() == "en" %]class="nocursor"[% ELSE %]href="[% c.url_with().query(lang => 'en') %]"[% END %] data-lang="en" title="English">
+                                    <a [% IF l10n.language_tag() == "en" %]class="nocursor"[% ELSE %]href="[% c.url_with().query(lang => 'en') | html %]"[% END %] data-lang="en" title="English">
                                         <img src="images/en.png" />
                                         <label>English</label>
                                         [% IF l10n.language_tag() == "en" %]<span class="fa fa-check"></span>[% END %]
                                     </a>
                                 </li>
                                 <li class="et-submenu-option">
-                                    <a [% IF l10n.language_tag() == "fr" %]class="nocursor"[% ELSE %]href="[% c.url_with().query(lang => 'fr') %]"[% END %] data-lang="fr" title="Français">
+                                    <a [% IF l10n.language_tag() == "fr" %]class="nocursor"[% ELSE %]href="[% c.url_with().query(lang => 'fr') | html %]"[% END %] data-lang="fr" title="Français">
                                         <img src="images/fr.png" />
                                         <label>Français</label>
                                         [% IF l10n.language_tag() == "fr" %]<span class="fa fa-check"></span>[% END %]
diff --git a/templates/web/renater/index.html.tt2 b/templates/web/renater/index.html.tt2
index 32a1099d0dfff8b7fa6a06bd256d9bc244a6c4fd..497960b73025dc4f6647b283a9aeaf1224d07f15 100644
--- a/templates/web/renater/index.html.tt2
+++ b/templates/web/renater/index.html.tt2
@@ -62,14 +62,14 @@
                             </a>
                             <ul class="submenu vertical" data-submenu>
                                 <li>
-                                    <a [% IF l10n.language_tag() == "en" %]class="nocursor"[% ELSE %]href="[% c.url_with().query(lang => 'en') %]"[% END %] data-lang="en" title="English">
+                                    <a [% IF l10n.language_tag() == "en" %]class="nocursor"[% ELSE %]href="[% c.url_with().query(lang => 'en') | html %]"[% END %] data-lang="en" title="English">
                                         <img src="images/en.png" />
                                         <label>English</label>
                                         [% IF l10n.language_tag() == "en" %]<span class="fa fa-check"></span>[% END %]
                                     </a>
                                 </li>
                                 <li>
-                                    <a [% IF l10n.language_tag() == "fr" %]class="nocursor"[% ELSE %]href="[% c.url_with().query(lang => 'fr') %]"[% END %] data-lang="fr" title="Français">
+                                    <a [% IF l10n.language_tag() == "fr" %]class="nocursor"[% ELSE %]href="[% c.url_with().query(lang => 'fr') | html %]"[% END %] data-lang="fr" title="Français">
                                         <img src="images/fr.png" />
                                         <label>Français</label>
                                         [% IF l10n.language_tag() == "fr" %]<span class="fa fa-check"></span>[% END %]