diff --git a/gestioncof/templates/login.html b/gestioncof/templates/login.html
index 7e6a6e66..89b68380 100644
--- a/gestioncof/templates/login.html
+++ b/gestioncof/templates/login.html
@@ -10,7 +10,8 @@
         <p class="error">Identifiants incorrects.</p>
         {% endif %} 
 
-        <form method="post" action="{% url 'gestioncof.views.login_ext' %}">
+        <form method="post"
+	      action="{% url 'gestioncof.views.login_ext' %}?next={{ next|urlencode }}">
         {% csrf_token %}
         <table>
         <tr>
diff --git a/gestioncof/templates/login_switch.html b/gestioncof/templates/login_switch.html
index fe816a78..aafbf54f 100644
--- a/gestioncof/templates/login_switch.html
+++ b/gestioncof/templates/login_switch.html
@@ -3,10 +3,12 @@
 {% block content %}
 <div id="main-login-container">
     <div id="main-login">
-        <a id="login_clipper" href="{% url 'django_cas_ng.views.login' %}">
+        <a id="login_clipper"
+           href="{% url 'django_cas_ng.views.login' %}?next={{ next|urlencode }}">
             Compte clipper
         </a>
-        <a id="login_outsider" href="{% url 'gestioncof.views.login_ext' %}">
+        <a id="login_outsider"
+           href="{% url 'gestioncof.views.login_ext' %}?next={{ next|urlencode }}">
             Extérieur
         </a>
         <div class="spacer"></div>
diff --git a/gestioncof/views.py b/gestioncof/views.py
index e2f59d44..2d5f0487 100644
--- a/gestioncof/views.py
+++ b/gestioncof/views.py
@@ -43,7 +43,10 @@ def home(request):
 def login(request):
     if request.user.is_authenticated():
         return redirect("gestioncof.views.home")
-    return render(request, "login_switch.html", {})
+    context = {}
+    if request.method == "GET" and 'next' in request.GET:
+        context['next'] = request.GET['next']
+    return render(request, "login_switch.html", context)
 
 
 def login_ext(request):
@@ -60,7 +63,13 @@ def login_ext(request):
                                   {"error_type": "no_password"})
         except User.DoesNotExist:
             pass
-    return django_login_view(request, template_name='login.html')
+    context = {}
+    if request.method == "GET" and 'next' in request.GET:
+        context['next'] = request.GET['next']
+    if request.method == "POST" and 'next' in request.POST:
+        context['next'] = request.POST['next']
+    return django_login_view(request, template_name='login.html',
+                             extra_context=context)
 
 
 @login_required