diff --git a/remo/base/templates/base_fd4.jinja b/remo/base/templates/base_fd4.jinja
index 4455111c7..ea01bfaa2 100644
--- a/remo/base/templates/base_fd4.jinja
+++ b/remo/base/templates/base_fd4.jinja
@@ -84,10 +84,10 @@
               <div class="account anonymous nomenu logout">
                 {% if not user.is_authenticated() %}
                   {% if request.get_full_path() != '/' %}
-                    {% set next=request.get_full_path() %}
+                    {% set next_url=request.REQUEST.next %}
                   {% endif %}
                   <span id="login-menu-locator">
-                    <a href="{{ url('oidc_authentication_init') }}">
+                    <a href="{{ url('oidc_authentication_init') }}?next={{ next_url }}">
                       Login
                     </a>
                   </span>