diff --git a/classes/admin.php b/classes/admin.php
index 8392b479..fda34d39 100644
--- a/classes/admin.php
+++ b/classes/admin.php
@@ -185,8 +185,7 @@ class Admin
                     $grav = $this->grav;
 
                     $this->setMessage($this->translate('PLUGIN_ADMIN.LOGIN_LOGGED_IN'), 'info');
-                    $redirect_route = $this->uri->route();
-                    $grav->redirect($redirect_route);
+                    $grav->redirect($form['redirect']);
                 }
             }
         }
diff --git a/themes/grav/templates/partials/login.html.twig b/themes/grav/templates/partials/login.html.twig
index 0230c5b8..dfc49de7 100644
--- a/themes/grav/templates/partials/login.html.twig
+++ b/themes/grav/templates/partials/login.html.twig
@@ -13,9 +13,9 @@
 
         <form method="post" action="{{ base_url_relative }}">
             <div class="padding">
-            {% block form %}{% endblock %}
-
-            {{ nonce_field('admin-form', 'admin-nonce') }}
+                {% block form %}{% endblock %}
+                <input type="hidden" name="redirect" value="{{ uri.url }}" />
+                {{ nonce_field('admin-form', 'admin-nonce') }}
             </div>
         </form>
     </section>