diff --git a/kfet/templates/kfet/base_nav.html b/kfet/templates/kfet/base_nav.html
index 1b71d8ca..7db5cdc5 100644
--- a/kfet/templates/kfet/base_nav.html
+++ b/kfet/templates/kfet/base_nav.html
@@ -91,7 +91,7 @@
           {% if user.username != 'kfet_genericteam' %}
           <li class="divider"></li>
           <li>
-            <a href="#" data-url="{% url "kfet.login.generic" %}" onclick="submit_url(this)">
+            <a href="#" data-url="{% url "kfet.login.generic" %}?next={{ request.get_full_path|urlencode }}" onclick="submit_url(this)">
               {% trans "Ouvrir une session partagée" %}
             </a>
           </li>
@@ -116,7 +116,7 @@
       </li>
       {% elif not user.is_authenticated %}
       <li>
-        <a href="{% url "account_login" %}?next={{ request.path|urlencode }}" title="{% trans "Connexion" %}">
+        <a href="{% url "account_login" %}?next={{ request.get_full_path|urlencode }}" title="{% trans "Connexion" %}">
           <span>{% trans "Connexion" %}</span><span class="glyphicon glyphicon-log-in"></span>
         </a>
       </li>