diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
index eefc245d69..43e57168ba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
@@ -130,7 +130,8 @@
             let refresh_max_date = 0;
             let disable_buttons = [];
 
-            if( $(this).data("flatpickr-futuredate") === true ) {
+            if( $(this).data("flatpickr-futureinclusive") === true
+             || $(this).data("flatpickr-futuredate") === true ) {
                 let original_date = $(this).val();
                 if ( original_date ) {
                     original_date = Date_from_syspref( original_date ).getTime();
@@ -143,10 +144,18 @@
                     }];
                 }
                 else {
-                    options['minDate'] = new Date().fp_incr(1);
+                    if( $(this).data("flatpickr-futureinclusive") === true ) {
+                        options['minDate'] = new Date().setHours(00, 00, 00, 00);
+                    } else {
+                        options['minDate'] = new Date().fp_incr(1);
+                    }
                 }
+
                 disable_buttons.push(0); /* Yesterday */
-                disable_buttons.push(1); /* Today */
+
+                if ( $(this).data("flatpickr-futuredate") === true ) {
+                    disable_buttons.push(1); /* Today */
+                }
             }
             if( $(this).data("flatpickr-pastinclusive") === true ) {
                 options['maxDate'] = new Date(); /* Not today or hh:mm will be 00:00 */
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
index 07e0d7bc47..e2007122a8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
@@ -476,7 +476,7 @@
 
                                             <li>
                                                 <label for="pickup_date">Pickup date: </label>
-                                                <input id="pickup_date" name="pickup_date" required="required" class="flatpickr" data-flatpickr-futuredate="true" />
+                                                <input id="pickup_date" name="pickup_date" required="required" class="flatpickr" data-flatpickr-futureinclusive="true" />
                                             </li>
 
                                             <li id="pickup-times" class="radio"></li>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc
index 7059ef9b66..9e7a67520d 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc
@@ -141,7 +141,8 @@
                 let refresh_max_date = 0;
                 let disable_buttons = [];
 
-                if( $(this).data("flatpickr-futuredate") === true ) {
+                if( $(this).data("flatpickr-futureinclusive") === true
+                 || $(this).data("flatpickr-futuredate") === true ) {
                     let original_date = $(this).val();
                     if ( original_date ) {
                         original_date = Date_from_syspref( original_date ).getTime();
@@ -154,10 +155,18 @@
                         }];
                     }
                     else {
-                        options['minDate'] = new Date().fp_incr(1);
+                        if( $(this).data("flatpickr-futureinclusive") === true ) {
+                            options['minDate'] = new Date().setHours(00, 00, 00, 00);
+                        } else {
+                            options['minDate'] = new Date().fp_incr(1);
+                        }
                     }
+
                     disable_buttons.push(0); /* Yesterday */
-                    disable_buttons.push(1); /* Today */
+
+                    if ( $(this).data("flatpickr-futuredate") === true ) {
+                        disable_buttons.push(1); /* Today */
+                    }
                 }
                 if( $(this).data("flatpickr-pastinclusive") === true ) {
                     options['maxDate'] = new Date(); /* Not today or hh:mm will be 00:00 */
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt
index fc897085ce..c24d1255ba 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt
@@ -242,9 +242,9 @@
                                                     <div class="required_label required">Required</div>
                                                 </li>
                                                 <li id="pickup_date_item">
-                                                    <label for="pickup-date">Pickup date:</label>
-                                                    <input name="pickup_date" type="text" class="flatpickr" id="pickup-date" required="required" data-flatpickr-futuredate="true" />
-                                                    <div class="required_label required">Required</div>
+                                                    <label for="pickup_date">Pickup date:</label>
+                                                    <input name="pickup_date" type="text" class="flatpickr" id="pickup-date" required="required" data-flatpickr-futureinclusive="true" />
+                                                    <span class="required">Required</span>
                                                 </li>
 
                                                 <li id="pickup-times"></li>