diff --git a/src/Core/GNUsocial.php b/src/Core/GNUsocial.php
index baaeb9e410..5b3ce0544d 100644
--- a/src/Core/GNUsocial.php
+++ b/src/Core/GNUsocial.php
@@ -1,6 +1,7 @@
 <?php
 
 // {{{ License
+
 // This file is part of GNU social - https://www.gnu.org/software/social
 //
 // GNU social is free software: you can redistribute it and/or modify
@@ -15,6 +16,7 @@
 //
 // You should have received a copy of the GNU Affero General Public License
 // along with GNU social.  If not, see <http://www.gnu.org/licenses/>.
+
 // }}}
 
 /**
@@ -130,8 +132,9 @@ class GNUsocial implements EventSubscriberInterface
                                     string $event_name): RequestEvent
     {
         $request = $event->getRequest();
-        if (!(!$event->isMasterRequest() || $request->isXmlHttpRequest()
-             || 'login' === $request->attributes->get('_route'))) {
+
+        // Save the target path, so we can redirect back after logging in
+        if (!(!$event->isMasterRequest() || $request->isXmlHttpRequest() || 'login' === $request->attributes->get('_route'))) {
             $this->saveTargetPath($this->session, 'main', $request->getUri());
         }
 
diff --git a/src/Core/Router/RouteLoader.php b/src/Core/Router/RouteLoader.php
index 2bfb247f63..864b7d533e 100644
--- a/src/Core/Router/RouteLoader.php
+++ b/src/Core/Router/RouteLoader.php
@@ -89,7 +89,7 @@ class RouteLoader extends Loader
                         '_format'     => $options['format'] ?? 'html',
                         '_fragment'   => $options['fragment'] ?? '',
                         '_locale'     => $options['locale'] ?? 'en',
-                        'template'    => $options['template'] ?? 'en',
+                        'template'    => $options['template'] ?? '',
                     ],
                     $options['defaults'] ?? []),
                 // requirements = [] -- param => regex