diff --git a/themes/grav/templates/partials/login.html.twig b/themes/grav/templates/partials/login.html.twig
index 918e1fb7..32d511a4 100644
--- a/themes/grav/templates/partials/login.html.twig
+++ b/themes/grav/templates/partials/login.html.twig
@@ -15,7 +15,7 @@
 
         {% block integration %}{% endblock %}
 
-        {% set redirect = redirect ?: uri.path %}
+        {% set redirect = redirect ?: uri.path ~ uri.params ~ (uri.query ? '?' ~ uri.query : '') %}
 
         <form method="post" action="{{ base_url_relative }}">
             <div class="padding">