diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
index 85ec55b7ad..49cff4e359 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
@@ -122,6 +122,12 @@ jQuery(function($){
         showMonthAfterYear: false,
         yearSuffix: ''};
     $.datepicker.setDefaults($.datepicker.regional['']);
+    $.timepicker.regional[''] = {
+        timeFormat: "[% IF Koha.Preference('TimeFormat') == '12hr' %]hh:mm TT[% ELSE %]HH:mm[% END %]",
+        amNames: ['AM', 'A'],
+        pmNames: ['PM', 'P'],
+    };
+    $.timepicker.setDefaults($.timepicker.regional['']);
 });
 
 /*  jQuery Validator plugin custom method
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 d1ca0114c6..0370e275ae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -235,7 +235,7 @@
 
                                     [% IF ( INVALID_DATE ) %]
                                         <p>
-                                          <input type="text" size="13" id="duedatespec" name="duedatespec" value="[% duedatespec | html %]" />
+                                          <input type="text" size="13" id="duedatespec" name="duedatespec" value="[% duedatespec | $KohaDates as_due_date => 1 %]" />
                                             <label for="duedatespec">Due date</label>
                                         </p>
                                     [% ELSE %]