VUFIND-1004

module/VuFind/src/VuFind/Controller/MyResearchController.php

@@ -1103,7 +1103,8 @@ class MyResearchController extends AbstractBase
     public function recoverAction()
     {
         // Make sure we're configured to do this
-        if (!$this->getAuthManager()->supportsRecovery()) {
+        $method = trim($this->params()->fromQuery('auth_method'));
+        if (!$this->getAuthManager()->supportsRecovery($method)) {
             $this->flashMessenger()->setNamespace('error')
                 ->addMessage('recovery_disabled');
             return $this->redirect()->toRoute('myresearch-home');

module/VuFind/src/VuFind/View/Helper/Root/Auth.php

@@ -228,7 +228,6 @@ class Auth extends \Zend\View\Helper\AbstractHelper
         return array_pop($classParts);
     }
 
-    
     /**
      * Render the new password form template.
      *
@@ -241,7 +240,6 @@ class Auth extends \Zend\View\Helper\AbstractHelper
         return $this->renderTemplate('newpassword.phtml', $context);
     }
 
-    
     /**
      * Render the password recovery form template.
      *

themes/bootstrap/templates/Auth/AbstractBase/login.phtml

@@ -12,7 +12,7 @@
         <input class="btn btn-primary" type="submit" name="processLogin" value="Login">
         <? if ($account->supportsRecovery()): ?>
           <br/>
-          <a class="btn btn-link" href="<?=$this->url('myresearch-recover') ?>"><?=$this->transEsc('Forgot Password')?></a>
+          <a class="btn btn-link" href="<?=$this->url('myresearch-recover') ?>?auth_method=<?=$this->auth()->getActiveAuthMethod()?>"><?=$this->transEsc('Forgot Password')?></a>
         <? endif; ?>
       </div>
     </div>