diff --git a/circ/circulation.pl b/circ/circulation.pl
index 9296d9e642..87d977d72b 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -425,7 +425,7 @@ if (@$barcodes) {
                 $template_params->{getBarcodeMessageIteminfo} = $item->barcode;
                 $template_params->{NEEDSCONFIRMATION} = 1;
                 $confirm_required = 1;
-                if ( $needsconfirmation eq 'BOOKED_TO_ANOTHER' ) {
+                if ( $needsconfirmation_key eq 'BOOKED_TO_ANOTHER' ) {
                     my $reduceddue =
                         dt_from_string( $$needsconfirmation{$needsconfirmation_key}->start_date )->subtract( days => 1 );
                     $template_params->{reduceddue} = $reduceddue;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
index f027552053..e3de0dde7c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
@@ -181,6 +181,10 @@
             options['dateFormat'] = "Y-m-d H:i";
             options['altFormat'] = flatpickr_dateformat_string + " " + flatpickr_timeformat_string;
         }
+        let maxDate = $(input).data("flatpickr-maxdate");
+        if( typeof maxDate !== 'undefined' ) {
+            options['maxDate'] = new Date(maxDate);
+        }
 
         let fp = $(input).flatpickr(options);
 
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 979f916cd8..baddf3dc45 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -345,7 +345,7 @@
                                     [% IF ( INVALID_DATE ) %]
                                         <p>
                                           <input type="text" size="20" id="duedatespec" name="duedatespec" value="[% duedatespec | html %]" class="flatpickr" data-flatpickr-enable-time="true" data-flatpickr-on-close-focus="#barcode" />
-                                            <label for="duedatespec">Due date</label>
+                                          <label for="duedatespec">Due date</label>
                                         </p>
                                     [% ELSE %]
                                         <input type="hidden" name="duedatespec" value="[% duedatespec | html %]" />
@@ -354,7 +354,7 @@
                                     [% IF ( BOOKED_TO_ANOTHER ) %]
                                         <p>
                                             <label for="reduceddue">Reducing due date to: <label>
-                                            <input type="text" size="20" id="reudceddue" name="reduceddue" value="[% reduceddue | $KohaDates with_hours => 1 %]" readonly="readonly">
+                                            <input type="text" size="20" id="reduceddue" name="reduceddue" value="[% reduceddue | html %]" class="flatpickr" data-flatpickr-futuredate="true" data-flatpickr-maxdate="[% reduceddue | html %]" required="required">
                                         </p>
                                     [% END %]