diff --git a/client/src/components/form-date-picker/form-date-picker.component.jsx b/client/src/components/form-date-picker/form-date-picker.component.jsx
index 9ce7aa7f4..ba97b051e 100644
--- a/client/src/components/form-date-picker/form-date-picker.component.jsx
+++ b/client/src/components/form-date-picker/form-date-picker.component.jsx
@@ -16,7 +16,6 @@ export default function FormDatePicker({
 
   const handleChange = (newDate) => {
     if (value !== newDate && onChange) {
-      console.log("XXX1");
       onChange(newDate);
     }
   };
@@ -25,7 +24,7 @@ export default function FormDatePicker({
     if (e.key.toLowerCase() === "t") {
       if (onChange) {
         onChange(new moment());
-        if (ref.current && ref.current.blur) ref.current.blur();
+        // if (ref.current && ref.current.blur) ref.current.blur();
       }
     } else if (e.key.toLowerCase() === "enter") {
       if (ref.current && ref.current.blur) ref.current.blur();
@@ -42,6 +41,16 @@ export default function FormDatePicker({
       "en",
       false
     );
+
+    if (_a.isValid() && value && value.isValid && value.isValid()) {
+      _a.set({
+        hours: value.hours(),
+        minutes: value.minutes(),
+        seconds: value.seconds(),
+        milliseconds: value.milliseconds(),
+      });
+    }
+
     if (_a.isValid() && onChange) onChange(_a);
   };