diff --git a/wcs/forms/root.py b/wcs/forms/root.py
index 1e7bc67ca..bd2c930e9 100644
--- a/wcs/forms/root.py
+++ b/wcs/forms/root.py
@@ -18,6 +18,7 @@ import copy
 import io
 import json
 import time
+import urllib.parse
 
 try:
     import qrcode
@@ -785,8 +786,9 @@ class FormPage(Directory, FormTemplateMixin):
         r += htmltext('</div>')
         root_url = get_publisher().get_root_url()
         for auth_context in self.formdef.required_authentication_contexts:
-            r += htmltext('<p><a class="button" href="%slogin/?forceAuthn=true">%s</a></p>') % (
+            r += htmltext('<p><a class="button" href="%slogin/?forceAuthn=true&next=%s">%s</a></p>') % (
                 root_url,
+                urllib.parse.quote(get_request().get_path_query()),
                 _('Login with %s') % auth_contexts[auth_context],
             )
         return r.getvalue()