diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
index 0652454394..51729cfc90 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
@@ -174,7 +174,7 @@
                                                     <span>Last renewed [% checkout.lastreneweddate | $KohaDates %]</span>,
                                                 [% END %]
                                                 [% IF ( checkout.date_due ) %]
-                                                    <span>Due back on [% checkout.date_due | $KohaDates %]</span>
+                                                    <span>Due back on [% checkout.date_due | $KohaDates as_due_date => 1 %]</span>
                                                 [% ELSE %]
                                                     <span>Not checked out</span>
                                                 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
index a6f121eb73..9b0664a6d1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
@@ -184,7 +184,7 @@
                             ( <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% item.itemnumber | uri %]&amp;biblionumber=[% item.biblio.biblionumber | uri %]&amp;bi=[% item.biblioitemnumber.biblioitemnumber | uri %]#item[% item.itemnumber | uri %]">[% item.barcode | html %]</a> )
                             renewed for
                             [% borrower.firstname | html %] [% borrower.surname | html %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | uri %]"> [% borrower.cardnumber | html %] </a> )
-                            now due on [% date_due | $KohaDates %]
+                            now due on [% date_due | $KohaDates as_due_date => 1 %]
                         </p>
                     </div>
                 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
index 70869050cd..64ebffe016 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
@@ -289,7 +289,7 @@
                                 </li>
                                 <li>
                                     <label>Due date:</label>
-                                    [% whole.value.check_out.date_due | $KohaDates with_hours => 1 %]
+                                    [% whole.value.check_out.date_due | $KohaDates as_due_date => 1 %]
                                 </li>
                             </ol>
                         </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
index 3a606e06bb..92a920d206 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
@@ -57,7 +57,7 @@
                             <td>[% issue.author | html %]</td>
                             <td>[% issue.itemcallnumber | html %]</td>
                             <td>[% ItemTypes.GetDescription( issue.itype ) | html %]</td>
-                            <td>[% issue.date_due | $KohaDates  as_due_date => 1 %]</td>
+                            <td>[% issue.date_due | $KohaDates as_due_date => 1 %]</td>
                             <td>[% issue.barcode | html %]</td>
                             <td>[% issue.stocknumber | html %]</td>
                             [% IF ( issue.charge <= 0 ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
index fb095ed66c..1008163734 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -852,7 +852,7 @@
                                                 [% END %]
                                                 [% IF ( itemloo.onloan ) %]
                                                     <td data-order="[% itemloo.date_due | html %]">
-                                                        <span class="checkedout">Due [% itemloo.date_due | $KohaDates  as_due_date => 1 %]</span>
+                                                        <span class="checkedout">Due [% itemloo.date_due | $KohaDates as_due_date => 1 %]</span>
                                                 [% ELSE %]
                                                     <td>
                                                         [% IF ( itemloo.transfertwhen ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt
index 92625eb643..f2804af257 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt
@@ -128,7 +128,7 @@
                                                     <td>[% item.enumchron | html %]</td>
                                                     <td>
                                                         [% IF ( item.checkout ) %]
-                                                            <span class="checkedout">Due [% item.checkout.date_due | $KohaDates %]</span>
+                                                            <span class="checkedout">Due [% item.checkout.date_due | $KohaDates as_due_date => 1 %]</span>
                                                         [% ELSIF ( item.get_transfer ) %]
                                                             <span class="intransit">In transit from [% Branches.GetName( item.get_transfer.frombranch ) | html %] to [% Branches.GetName( item.get_transfer.tobranch ) | html %] since [% item.get_transfer.datesent | $KohaDates %]</span>
                                                         [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt
index 8b7a358fa8..833befc69d 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt
@@ -101,7 +101,7 @@
                                                     <td class="due_date">
                                                         <span class="tdlabel">Due date</span>
                                                         [% IF ( RECALL.requested ) %]
-                                                            <span>Due to be returned by [% RECALL.checkout.date_due | $KohaDates %]</span>
+                                                            <span>Due to be returned by [% RECALL.checkout.date_due | $KohaDates as_due_date => 1 %]</span>
                                                         [% ELSIF ( RECALL.waiting and RECALL.expiration_date ) %]
                                                             <span>Pick up by [% RECALL.expiration_date | $KohaDates %]</span>
                                                         [% ELSE %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
index 89d726132f..8fa260e94c 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -789,7 +789,7 @@
                                                     </td>
                                                     <td data-order="[% OVERDUE.date_due | html %]">
                                                         <span class="tdlabel">Date due:</span>
-                                                        [% OVERDUE.date_due | $KohaDates  as_due_date => 1 %]
+                                                        [% OVERDUE.date_due | $KohaDates as_due_date => 1 %]
                                                     </td>
                                                     [% IF ( OpacRenewalAllowed ) %]
                                                         <td>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
index 7f2b299aee..1f40f5ce39 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
@@ -334,11 +334,11 @@
                                                     <td>[% ISSUE.itemcallnumber | html %]</td>
                                                     [% IF ( ISSUE.overdue ) %]
                                                         <td class="overdue" data-order="[% ISSUE.date_due | html %]">
-                                                            [% ISSUE.date_due | $KohaDates  as_due_date => 1 %]
+                                                            [% ISSUE.date_due | $KohaDates as_due_date => 1 %]
                                                         </td>
                                                     [% ELSE   %]
                                                         <td data-order="[% ISSUE.date_due | html %]">
-                                                            [% ISSUE.date_due | $KohaDates  as_due_date => 1 %]
+                                                            [% ISSUE.date_due | $KohaDates as_due_date => 1 %]
                                                         </td>
                                                     [% END %]
                                                     <td>