diff --git a/libraries/src/Router/SiteRouter.php b/libraries/src/Router/SiteRouter.php
index ff4793c0f5fc0..3bb3d267249a5 100644
--- a/libraries/src/Router/SiteRouter.php
+++ b/libraries/src/Router/SiteRouter.php
@@ -602,7 +602,7 @@ protected function processParseRules(&$uri, $stage = self::PROCESS_DURING)
 				if ($start !== null)
 				{
 					$uri->delVar('start');
-					$vars['limitstart'] = $start;
+					$uri->setVar('limitstart', $start);
 				}
 			}
 		}
diff --git a/templates/protostar/offline.php b/templates/protostar/offline.php
index 7a0ef5c47861e..ffb97ea54860e 100644
--- a/templates/protostar/offline.php
+++ b/templates/protostar/offline.php
@@ -9,6 +9,8 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Uri\Uri;
+
 /** @var JDocumentHtml $this */
 
 $twofactormethods = JAuthenticationHelper::getTwoFactorMethods();
@@ -116,7 +118,7 @@
 				<?php endif; ?>
 				</div>
 				<jdoc:include type="message" />
-				<form action="<?php echo JRoute::_('index.php', true); ?>" method="post" id="form-login">
+				<form action="<?php echo JRoute::_('index.php?option=com_users&view=login'); ?>" method="post" id="form-login">
 					<fieldset>
 						<label for="username"><?php echo JText::_('JGLOBAL_USERNAME'); ?></label>
 						<input name="username" id="username" type="text" title="<?php echo JText::_('JGLOBAL_USERNAME'); ?>" />
@@ -131,9 +133,10 @@
 
 						<input type="submit" name="Submit" class="btn btn-primary" value="<?php echo JText::_('JLOGIN'); ?>" />
 
-						<input type="hidden" name="option" value="com_users" />
 						<input type="hidden" name="task" value="user.login" />
-						<input type="hidden" name="return" value="<?php echo base64_encode(JUri::base()); ?>" />
+						<?php $uri = new Uri('index.php'); ?>
+						<?php $uri->setQuery($app->getRouter()->getVars()); ?>
+						<input type="hidden" name="return" value="<?php echo base64_encode($uri->tostring()); ?>" />
 						<?php echo JHtml::_('form.token'); ?>
 					</fieldset>
 				</form>
diff --git a/templates/system/offline.php b/templates/system/offline.php
index 391a2edc4a4a2..39ede4b1ea5ca 100644
--- a/templates/system/offline.php
+++ b/templates/system/offline.php
@@ -9,6 +9,8 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Uri\Uri;
+
 /** @var JDocumentHtml $this */
 
 $app = JFactory::getApplication();
@@ -58,7 +60,7 @@
 			<?php echo JText::_('JOFFLINE_MESSAGE'); ?>
 		</p>
 	<?php endif; ?>
-	<form action="<?php echo JRoute::_('index.php', true); ?>" method="post" id="form-login">
+	<form action="<?php echo JRoute::_('index.php?option=com_users&view=login'); ?>" method="post" id="form-login">
 	<fieldset class="input">
 		<p id="form-login-username">
 			<label for="username"><?php echo JText::_('JGLOBAL_USERNAME'); ?></label>
@@ -77,9 +79,10 @@
 		<p id="submit-buton">
 			<input type="submit" name="Submit" class="button login" value="<?php echo JText::_('JLOGIN'); ?>" />
 		</p>
-		<input type="hidden" name="option" value="com_users" />
 		<input type="hidden" name="task" value="user.login" />
-		<input type="hidden" name="return" value="<?php echo base64_encode(JUri::base()); ?>" />
+		<?php $uri = new Uri('index.php'); ?>
+		<?php $uri->setQuery($app->getRouter()->getVars()); ?>
+		<input type="hidden" name="return" value="<?php echo base64_encode($uri->tostring()); ?>" />
 		<?php echo JHtml::_('form.token'); ?>
 	</fieldset>
 	</form>
diff --git a/tests/unit/suites/libraries/cms/router/JRouterSiteTest.php b/tests/unit/suites/libraries/cms/router/JRouterSiteTest.php
index 9037fb1160af4..07b6b2d6bc1f7 100644
--- a/tests/unit/suites/libraries/cms/router/JRouterSiteTest.php
+++ b/tests/unit/suites/libraries/cms/router/JRouterSiteTest.php
@@ -1130,7 +1130,7 @@ public function testBuildSefRoute($url, $expected)
 	 */
 	public function testProcessParseRules()
 	{
-		$uri = new JUri('index.php?start=42');
+		$uri = new JUri('index.php?limit=30&start=42');
 
 		$object = new JRouterSite(
 			array(),
@@ -1144,8 +1144,8 @@ public function testProcessParseRules()
 
 		$vars = $processParseRulesMethod->invokeArgs($object, array(&$uri));
 
-		$this->assertEquals('index.php', $uri->toString());
-		$this->assertEquals(array('limitstart' => '42'), $vars);
+		$this->assertEquals('index.php?limit=30&limitstart=42', $uri->toString());
+		$this->assertEquals(array(), $vars);
 	}
 
 	/**