diff --git a/core/templates/login.php b/core/templates/login.php
index a12008295c..57ced76008 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'])) { ?>
diff --git a/lib/private/util.php b/lib/private/util.php
index 894fe9aa59..488eb8facf 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -968,7 +968,8 @@ class OC_Util {
 		}
 
 		$parameters['canResetPassword'] = true;
-		if (!\OC::$server->getSystemConfig()->getValue('lost_password_link')) {
+		$parameters['resetPasswordLink'] = \OC::$server->getSystemConfig()->getValue('lost_password_link', '');
+		if (!$parameters['resetPasswordLink']) {
 			if (isset($_REQUEST['user'])) {
 				$user = \OC::$server->getUserManager()->get($_REQUEST['user']);
 				if ($user instanceof IUser) {