diff --git a/circ/circulation.pl b/circ/circulation.pl
index f5932858a2..5f85d793f3 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -637,8 +637,6 @@ $template->param(
     AudioAlerts           => C4::Context->preference("AudioAlerts"),
     fast_cataloging   => $fast_cataloging,
     CircAutoPrintQuickSlip   => C4::Context->preference("CircAutoPrintQuickSlip"),
-    SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),
-    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
     RoutingSerials => C4::Context->preference('RoutingSerials'),
     relatives_issues_count => $relatives_issues_count,
     relatives_borrowernumbers => \@relatives,
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index acac9b2850..6c1fd20e26 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -986,16 +986,16 @@ No patron matched <span class="ex">[% message | html %]</span>
         </fieldset>
     </form>
 
-    [% IF SuspendHoldsIntranet %]
+    [% IF Koha.Preference('SuspendHoldsIntranet') %]
     <fieldset class="action">
         <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
             <input type="hidden" name="from" value="circ" />
             <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
             <input type="submit" value="Suspend all holds" />
 
-            [% IF AutoResumeSuspendedHolds %]
+            [% IF Koha.Preference('AutoResumeSuspendedHolds') %]
             <label for="suspend_until">until</label>
-            <input type="text" size="10" id="suspend_until" name="suspend_until" />
+            <input type="text" size="10" id="suspend_until" name="suspend_until" class="datepicker"/>
             <span class="hint">Specify date on which to resume [% INCLUDE 'date-format.inc' %]: </span>
              [% END %]
         </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index 6e5308f937..fd6b5e96c6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -607,16 +607,16 @@ function validate1(date) {
         </fieldset>
     </form>
 
-    [% IF SuspendHoldsIntranet %]
+    [% IF Koha.Preference('SuspendHoldsIntranet') %]
     <fieldset class="action">
         <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
             <input type="hidden" name="from" value="borrower" />
             <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
             <input type="submit" value="Suspend all holds" />
 
-            [% IF AutoResumeSuspendedHolds %]
+            [% IF Koha.Preference('AutoResumeSuspendedHolds') %]
             <label for="suspend_until">until</label>
-            <input type="text" size="10" id="suspend_until" name="suspend_until datepicker"/>
+            <input type="text" size="10" id="suspend_until" name="suspend_until" class="datepicker"/>
             <span class="hint">Specify date on which to resume [% INCLUDE 'date-format.inc' %]: </span>
             [% END %]
         </form>
diff --git a/members/moremember.pl b/members/moremember.pl
index ad71dfc9a8..1ac6a3d404 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -362,8 +362,6 @@ $template->param(
     quickslip       => $quickslip,
     housebound_role => scalar $patron->housebound_role,
     privacy_guarantor_checkouts => $data->{'privacy_guarantor_checkouts'},
-    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
-    SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),
     RoutingSerials => C4::Context->preference('RoutingSerials'),
     PatronsPerPage => C4::Context->preference("PatronsPerPage") || 20,
     relatives_issues_count => $relatives_issues_count,