diff --git a/apps/web/src/app/(signing)/sign/[token]/date-field.tsx b/apps/web/src/app/(signing)/sign/[token]/date-field.tsx
index 40d0f945a..ce34a55fd 100644
--- a/apps/web/src/app/(signing)/sign/[token]/date-field.tsx
+++ b/apps/web/src/app/(signing)/sign/[token]/date-field.tsx
@@ -49,7 +49,7 @@ export const DateField = ({
 
   const localDateString = convertToLocalSystemFormat(field.customText, dateFormat, timezone);
 
-  const isDifferentTimeZone = field.inserted && localDateString !== field.customText;
+  const isDifferentTime = field.inserted && localDateString !== field.customText;
 
   const tooltipText = `"${field.customText}" will appear on the document as it has a timezone of "${timezone}".`;
 
@@ -98,7 +98,7 @@ export const DateField = ({
       onSign={onSign}
       onRemove={onRemove}
       type="Date"
-      tooltipText={isDifferentTimeZone ? tooltipText : undefined}
+      tooltipText={isDifferentTime ? tooltipText : undefined}
     >
       {isLoading && (
         <div className="bg-background absolute inset-0 flex items-center justify-center rounded-md">
diff --git a/packages/lib/constants/date-formats.ts b/packages/lib/constants/date-formats.ts
index 8c9ebe9e6..5b36cefdf 100644
--- a/packages/lib/constants/date-formats.ts
+++ b/packages/lib/constants/date-formats.ts
@@ -5,10 +5,15 @@ import { DEFAULT_DOCUMENT_TIME_ZONE } from './time-zones';
 export const DEFAULT_DOCUMENT_DATE_FORMAT = 'yyyy-MM-dd hh:mm a';
 
 export const DATE_FORMATS = [
+  {
+    key: 'yyyy-MM-dd_hh:mm_a',
+    label: 'YYYY-MM-DD HH:mm a',
+    value: DEFAULT_DOCUMENT_DATE_FORMAT,
+  },
   {
     key: 'YYYYMMDD',
     label: 'YYYY-MM-DD',
-    value: DEFAULT_DOCUMENT_DATE_FORMAT,
+    value: 'YYYY-MM-DD',
   },
   {
     key: 'DDMMYYYY',
@@ -57,15 +62,18 @@ export const convertToLocalSystemFormat = (
   dateFormat: string | null = DEFAULT_DOCUMENT_DATE_FORMAT,
   timeZone: string | null = DEFAULT_DOCUMENT_TIME_ZONE,
 ): string => {
-  const parsedDate = DateTime.fromFormat(customText, dateFormat ?? DEFAULT_DOCUMENT_DATE_FORMAT, {
-    zone: timeZone ?? DEFAULT_DOCUMENT_TIME_ZONE,
+  const coalescedDateFormat = dateFormat ?? DEFAULT_DOCUMENT_DATE_FORMAT;
+  const coalescedTimeZone = timeZone ?? DEFAULT_DOCUMENT_TIME_ZONE;
+
+  const parsedDate = DateTime.fromFormat(customText, coalescedDateFormat, {
+    zone: coalescedTimeZone,
   });
 
   if (!parsedDate.isValid) {
     return 'Invalid date';
   }
 
-  const formattedDate = parsedDate.toLocal().toFormat(dateFormat ?? DEFAULT_DOCUMENT_DATE_FORMAT);
+  const formattedDate = parsedDate.toLocal().toFormat(coalescedDateFormat);
 
   return formattedDate;
 };