diff --git a/module/finc/config/module.config.php b/module/finc/config/module.config.php
index c470eba965c5b02de42c980e499cb30fe8f0641d..1b38c9f91a7f760973e7255fed1d9e804eaaa690 100644
--- a/module/finc/config/module.config.php
+++ b/module/finc/config/module.config.php
@@ -158,7 +158,7 @@ $config = [
 ];
 
 $nonTabRecordActions = [
-    'PDA', 'EmailHold', 'EmailHoldLink', 'ReportErrors'
+    'PDA', 'EmailHold', 'ReportErrors'
 ];
 
 
diff --git a/module/finc/src/finc/Controller/CustomTraits/EmailHoldTrait.php b/module/finc/src/finc/Controller/CustomTraits/EmailHoldTrait.php
index e6fbbf5a0976671888a37ef72503133d04b04819..0b9688e919a8ea3cbb63bf0f396dff454d352532 100644
--- a/module/finc/src/finc/Controller/CustomTraits/EmailHoldTrait.php
+++ b/module/finc/src/finc/Controller/CustomTraits/EmailHoldTrait.php
@@ -170,8 +170,7 @@ trait EmailHoldTrait
                 $to = new Address($emailProfile->to);
                 // Get mailer
                 $mailer = new Mailer(
-                    $this->getServiceLocator()
-                        ->get('VuFind\Mailer')->getTransport()
+                    $this->serviceLocator->get('VuFind\Mailer')->getTransport()
                 );
 
                 $mailer->sendTextHtml(
@@ -195,7 +194,7 @@ trait EmailHoldTrait
         // Find and format the default required date:
         $defaultRequired = $this->emailHold()
             ->getDefaultRequiredDate($checkRequests);
-        $defaultRequired = $this->getServiceLocator()->get('VuFind\DateConverter')
+        $defaultRequired = $this->serviceLocator->get('VuFind\DateConverter')
             ->convertToDisplayDate("U", $defaultRequired);
         try {
             $defaultPickup
diff --git a/module/finc/src/finc/ILS/Logic/Holds.php b/module/finc/src/finc/ILS/Logic/Holds.php
index c7f5a366f2c96379b27ec1b6a64e9e7ff25fa4b2..a81b6a21a87162cec024fe7dde2355e194070141 100644
--- a/module/finc/src/finc/ILS/Logic/Holds.php
+++ b/module/finc/src/finc/ILS/Logic/Holds.php
@@ -231,7 +231,7 @@ class Holds extends \VuFind\ILS\Logic\Holds
                     $copy['emailHoldLink'] = $this->getRequestDetails(
                         $copy,
                         $requestConfig['HMACKeys'],
-                        'EmailHoldLink'
+                        'EmailHold'
                     );
 
                     $copy['checkEmailHold']