diff --git a/client/src/js/components/bhDateEditor.js b/client/src/js/components/bhDateEditor.js
index a3820d6799..6366f5303a 100644
--- a/client/src/js/components/bhDateEditor.js
+++ b/client/src/js/components/bhDateEditor.js
@@ -6,6 +6,7 @@ angular.module('bhima.components')
       dateValue : '<', // one-way binding
       onChange : '&',
       minDate : '<?',
+      required : '<?',
       maxDate : '<?',
       allowFutureDate : '<?',
       disabled : '<?',
diff --git a/client/src/modules/templates/bhDateEditor.tmpl.html b/client/src/modules/templates/bhDateEditor.tmpl.html
index d8d269bb7b..3a62978eba 100644
--- a/client/src/modules/templates/bhDateEditor.tmpl.html
+++ b/client/src/modules/templates/bhDateEditor.tmpl.html
@@ -15,7 +15,7 @@
     ng-class="{ 'has-error' : DateEditorForm.$submitted && DateEditorForm.$invalid } "
     data-date-editor>
 
-    <label class="control-label" translate>
+    <label class="control-label" bh-date-editor-label translate>
       {{ $ctrl.label }}
     </label>
 
@@ -34,7 +34,7 @@
         data-date-editor-input
         ng-readonly="!$ctrl.editMode"
         ng-disabled="$ctrl.disabled"
-        ng-required="required">
+        ng-required="$ctrl.required">
       <span class="input-group-btn">
         <button
           type="button"
diff --git a/test/end-to-end/offdays/offdays.page.js b/test/end-to-end/offdays/offdays.page.js
index 38968f75cf..738e178ee4 100644
--- a/test/end-to-end/offdays/offdays.page.js
+++ b/test/end-to-end/offdays/offdays.page.js
@@ -17,7 +17,7 @@ class OffdayPage {
     await FU.buttons.create();
     await FU.input('OffdayModalCtrl.offday.label', offday.label);
 
-    components.dateEditor.set(new Date(offday.date), null, '[uib-modal] .title');
+    components.dateEditor.set(new Date(offday.date));
 
     await FU.input('OffdayModalCtrl.offday.percent_pay', offday.percent_pay);
 
@@ -50,7 +50,7 @@ class OffdayPage {
 
     await FU.input('OffdayModalCtrl.offday.label', updateOffday.label);
 
-    components.dateEditor.set(new Date(updateOffday.date), null, '[uib-modal] .title');
+    components.dateEditor.set(new Date(updateOffday.date));
 
     await FU.input('OffdayModalCtrl.offday.percent_pay', updateOffday.percent_pay);
 
diff --git a/test/end-to-end/shared/components/bhDateEditor.js b/test/end-to-end/shared/components/bhDateEditor.js
index dcabf53277..9c2587540c 100644
--- a/test/end-to-end/shared/components/bhDateEditor.js
+++ b/test/end-to-end/shared/components/bhDateEditor.js
@@ -18,7 +18,7 @@ module.exports = {
    *   close the selection component Dates.
    */
   set : async function set(date, id, elementClick) {
-    const elementCloseComponent = elementClick || '.header-image';
+    const elementCloseComponent = elementClick || '[bh-date-editor-label]';
 
     // fail hard if the user did not pass into
     /* if (!(date instanceof Date)) {