diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index ea857bb57df..2c7b7faed6f 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -135,7 +135,8 @@ class LoginController extends Controller {
 		}
 
 		$parameters['canResetPassword'] = true;
-		if (!$this->config->getSystemValue('lost_password_link')) {
+		$parameters['resetPasswordLink'] = $this->config->getSystemValue('lost_password_link', '');
+		if (!$parameters['resetPasswordLink']) {
 			if (!is_null($user) && $user !== '') {
 				$userObj = $this->userManager->get($user);
 				if ($userObj instanceof IUser) {
diff --git a/core/templates/login.php b/core/templates/login.php
index 45814fc71d9..5b0fd97cfd8 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -57,7 +57,7 @@ script('core', [
 		</p>
 
 		<?php if (!empty($_['invalidpassword']) && !empty($_['canResetPassword'])) { ?>
-		<a id="lost-password" class="warning" href="">
+		<a id="lost-password" class="warning" href="<?php p($_['resetPasswordLink']); ?>">
 			<?php p($l->t('Wrong password. Reset it?')); ?>
 		</a>
 		<?php } else if (!empty($_['invalidpassword'])) { ?>