diff --git a/spiffworkflow-frontend/src/themes/carbon/BaseInputTemplate/BaseInputTemplate.tsx b/spiffworkflow-frontend/src/themes/carbon/BaseInputTemplate/BaseInputTemplate.tsx
index 74e7702c1..da4412cc7 100644
--- a/spiffworkflow-frontend/src/themes/carbon/BaseInputTemplate/BaseInputTemplate.tsx
+++ b/spiffworkflow-frontend/src/themes/carbon/BaseInputTemplate/BaseInputTemplate.tsx
@@ -9,6 +9,7 @@ import {
 } from '@rjsf/utils';
 
 import { useCallback } from 'react';
+import { DATE_FORMAT, DATE_FORMAT_CARBON } from '../../../config';
 
 /** The `BaseInputTemplate` is the template to use to render the basic `<input>` component for the `core` theme.
  * It is used as the template for rendering many of the <input> based widgets that differ by `type` and callbacks only.
@@ -105,13 +106,13 @@ export default function BaseInputTemplate<
   if (type === 'date') {
     component = (
       <DatePicker
+        dateFormat={DATE_FORMAT_CARBON}
         className="date-input"
-        dateFormat="m-d-Y"
         datePickerType="single"
       >
         <DatePickerInput
           id={id}
-          placeholder="m-d-Y"
+          placeholder={DATE_FORMAT}
           helperText={helperText}
           type="text"
           size="md"
@@ -125,6 +126,7 @@ export default function BaseInputTemplate<
           disabled={disabled || readonly}
           onBlur={_onBlur}
           onFocus={_onFocus}
+          pattern={null}
         />
       </DatePicker>
     );
diff --git a/spiffworkflow-frontend/src/themes/carbon/DateWidget/DateWidget.tsx b/spiffworkflow-frontend/src/themes/carbon/DateWidget/DateWidget.tsx
index a5ee5f170..91846dfc4 100644
--- a/spiffworkflow-frontend/src/themes/carbon/DateWidget/DateWidget.tsx
+++ b/spiffworkflow-frontend/src/themes/carbon/DateWidget/DateWidget.tsx
@@ -1,24 +1,19 @@
-import React from 'react';
+import React, { useCallback } from 'react';
 import { getTemplate, WidgetProps } from '@rjsf/utils';
 
 function DateWidget(props: WidgetProps) {
-  const { options, registry } = props;
+  const { onChange, options, registry } = props;
   const BaseInputTemplate = getTemplate<'BaseInputTemplate'>(
     'BaseInputTemplate',
     registry,
     options
   );
-
-  return (
-    <BaseInputTemplate
-      type="date"
-      dateFormat="Y-m-d"
-      InputLabelProps={{
-        shrink: true,
-      }}
-      {...props}
-    />
+  const handleChange = useCallback(
+    (value: any) => onChange(value || undefined),
+    [onChange]
   );
+
+  return <BaseInputTemplate type="date" {...props} onChange={handleChange} />;
 }
 
 export default DateWidget;