diff --git a/ajax/editActivity.php b/ajax/editActivity.php
index 91e7a5835..93f828f67 100755
--- a/ajax/editActivity.php
+++ b/ajax/editActivity.php
@@ -72,7 +72,11 @@
 $activityMinute = trim(urldecode($_REQUEST['minute']));
 $activityAMPM = trim(urldecode($_REQUEST['ampm']));
 
-if (!DateUtility::validate('-', $activityDate, DATE_FORMAT_MMDDYY))
+$dateFormatFlag = $_SESSION['CATS']->isDateDMY()
+    ? DATE_FORMAT_DDMMYY
+    : DATE_FORMAT_MMDDYY;
+
+if (!DateUtility::validate('-', $activityDate, $dateFormatFlag))
 {
     die('Invalid availability date.');
     return;
@@ -87,7 +91,7 @@
 $date = sprintf(
     '%s %s',
     DateUtility::convert(
-        '-', $activityDate, DATE_FORMAT_MMDDYY, DATE_FORMAT_YYYYMMDD
+        '-', $activityDate, $dateFormatFlag, DATE_FORMAT_YYYYMMDD
     ),
     date('H:i:00', $time)
 );
diff --git a/js/activity.js b/js/activity.js
index 3824c8e23..3bdb3b0d2 100755
--- a/js/activity.js
+++ b/js/activity.js
@@ -274,7 +274,8 @@ function Activity_editEntry(activityID, dataItemID, dataItemType, sessionCookie)
         /* Date editor. */
         var dateSpan = document.createElement('span');
         var dateAndTime = unEscapeHTML(dateTD.innerHTML.replace(/(<([^>]+)>)/ig,""));
-        dateSpan.innerHTML = DateInputForDOM('dateEditActivity' + activityID, true, 'MM-DD-YY', dateAndTime.substr(0,dateAndTime.indexOf(' ')), -1);
+        var userDateFormat = (typeof window.CATSUserDateFormat !== 'undefined' ? window.CATSUserDateFormat : 'MM-DD-YY');
+        dateSpan.innerHTML = DateInputForDOM('dateEditActivity' + activityID, true, userDateFormat, dateAndTime.substr(0,dateAndTime.indexOf(' ')), -1);
 
         var timeString = dateAndTime.substr(dateAndTime.indexOf(' ')+2);
         var hourString = timeString.substr(0,timeString.indexOf(':'));
diff --git a/lib/ExtraFields.php b/lib/ExtraFields.php
index 33900a2c6..40b7589a5 100755
--- a/lib/ExtraFields.php
+++ b/lib/ExtraFields.php
@@ -28,6 +28,7 @@
  */
  
 include_once(LEGACY_ROOT . '/lib/Site.php');
+include_once(LEGACY_ROOT . '/lib/DateUtility.php');
  
 /**
  *	Extra Fields Library
@@ -555,26 +556,7 @@ public function getValuesForShow($dataItemID)
                 break;
                 
                 case EXTRA_FIELD_DATE:
-                    $dmy = false;
-                    
-                    if (isset($_SESSION['CATS']) && $_SESSION['CATS']->isLoggedIn())
-                    {
-                        if ($_SESSION['CATS']->isDateDMY())
-                        {
-                            $dmy = true;
-                        }
-                    } 
-                    else 
-                    {
-                        // Look up the sites preference. (This would happen on careersUI)
-                        $site = new Site($this->_siteID);
-                        $siteRS = $site->getSiteBySiteID($this->_siteID);
-                        
-                        if ($siteRS['dateFormatDDMMYY'] == 1)
-                        {
-                            $dmy = true; 
-                        }
-                    }
+                    $dmy = $this->_isDateDMY();
                     
                     if ($dmy)
                     {
@@ -677,7 +659,8 @@ public function getValuesForAdd()
                 break;
                 
                 case EXTRA_FIELD_DATE:
-                    $extraFields[$index]['addHTML'] = '<script type="text/javascript">DateInput(\'extraField'.$index.'\', false, \'MM-DD-YY\', \'\');</script>';
+                    $dateFormat = $this->_isDateDMY() ? 'DD-MM-YY' : 'MM-DD-YY';
+                    $extraFields[$index]['addHTML'] = '<script type="text/javascript">DateInput(\'extraField'.$index.'\', false, \''.$dateFormat.'\', \'\');</script>';
                 break;
                 
                 case EXTRA_FIELD_TEXT:
@@ -867,7 +850,15 @@ public function getValuesForEdit($dataItemID)
                 break;
                 
                 case EXTRA_FIELD_DATE:
-                    $extraFields[$index]['editHTML'] = '<script type="text/javascript">DateInput(\'extraField'.$index.'\', false, \'MM-DD-YY\', \''.$data['value'].'\');</script>';
+                    $userDateFormat = $this->_isDateDMY() ? 'DD-MM-YY' : 'MM-DD-YY';
+                    $userDateValue = $data['value'];
+                    if (!empty($userDateValue) && $userDateFormat == 'DD-MM-YY')
+                    {
+                        $userDateValue = DateUtility::convert(
+                            '-', $userDateValue, DATE_FORMAT_MMDDYY, DATE_FORMAT_DDMMYY
+                        );
+                    }
+                    $extraFields[$index]['editHTML'] = '<script type="text/javascript">DateInput(\'extraField'.$index.'\', false, \''.$userDateFormat.'\', \''.htmlspecialchars($userDateValue, ENT_QUOTES).'\');</script>';
                 break;
                                     
                 case EXTRA_FIELD_TEXT:
@@ -893,11 +884,40 @@ public function setValuesOnEdit($dataItemID)
     {
         $extraFields = $this->_getValuesWithSettings($dataItemID);
 
+        $dateFormatFlag = $this->_isDateDMY()
+            ? DATE_FORMAT_DDMMYY
+            : DATE_FORMAT_MMDDYY;
+
         for ($i = 0; $i < count($extraFields); $i++)
         {
-            if (isset($_POST['extraField' . $i]) && $extraFields[$i]['value'] != $_POST['extraField' . $i])
+            if (!isset($_POST['extraField' . $i]))
+            {
+                continue;
+            }
+
+            $newValue = $_POST['extraField' . $i];
+
+            if ($extraFields[$i]['extraFieldType'] == EXTRA_FIELD_DATE)
             {
-               $this->setValue($extraFields[$i]['fieldName'], $_POST['extraField' . $i], $dataItemID);
+                $newValue = trim($newValue);
+
+                if (!empty($newValue) &&
+                    !DateUtility::validate('-', $newValue, $dateFormatFlag))
+                {
+                    continue;
+                }
+
+                if (!empty($newValue))
+                {
+                    $newValue = DateUtility::convert(
+                        '-', $newValue, $dateFormatFlag, DATE_FORMAT_MMDDYY
+                    );
+                }
+            }
+
+            if ($extraFields[$i]['value'] != $newValue)
+            {
+               $this->setValue($extraFields[$i]['fieldName'], $newValue, $dataItemID);
             }
         }
     }
@@ -908,6 +928,20 @@ public function setValuesOnEdit($dataItemID)
      *
      * @return array extra fields
      */
+    private function _isDateDMY()
+    {
+        if (isset($_SESSION['CATS']) && $_SESSION['CATS']->isLoggedIn())
+        {
+            return $_SESSION['CATS']->isDateDMY();
+        }
+
+        /* Careers portal / unauthenticated: fall back to site preference. */
+        $site = new Site($this->_siteID);
+        $siteRS = $site->getSiteBySiteID($this->_siteID);
+
+        return ($siteRS['dateFormatDDMMYY'] == 1);
+    }
+
     public static function getValuesTypes()
     {
         return array (
diff --git a/modules/calendar/Calendar.tpl b/modules/calendar/Calendar.tpl
index b382162d2..e180fa3dd 100755
--- a/modules/calendar/Calendar.tpl
+++ b/modules/calendar/Calendar.tpl
@@ -2,6 +2,9 @@
 <?php TemplateUtility::printHeader('Calendar', array('modules/calendar/Calendar.css', 'js/highlightrows.js', 'modules/calendar/Calendar.js', 'modules/calendar/CalendarUI.js', 'modules/calendar/validator.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active); ?>
+    <script type="text/javascript">
+        window.CATSUserDateFormat = '<?php echo($_SESSION['CATS']->isDateDMY() ? 'DD-MM-YY' : 'MM-DD-YY'); ?>';
+    </script>
     <div id="main">
         <?php TemplateUtility::printQuickSearch(); ?>
 
@@ -84,7 +87,7 @@
                                                     <label id="dateLabel" for="date">Date:</label>
                                                 </td>
                                                 <td nowrap="nowrap" class="tdData">
-                                                    <script type="text/javascript">DateInput('dateAdd', true, 'MM-DD-YY', '<?php echo($this->currentDateMDY); ?>', -1);</script>
+                                                    <script type="text/javascript">DateInput('dateAdd', true, (typeof window.CATSUserDateFormat !== 'undefined' ? window.CATSUserDateFormat : 'MM-DD-YY'), '<?php echo($_SESSION['CATS']->isDateDMY() ? DateUtility::getAdjustedDate('d-m-y') : $this->currentDateMDY); ?>', -1);</script>
                                                 </td>
                                             </tr>
 
@@ -234,7 +237,7 @@
                                                     <label id="dateLabel" for="date">Date:</label>
                                                 </td>
                                                 <td nowrap="nowrap" class="tdData">
-                                                    <script type="text/javascript">DateInput('dateEdit', true, 'MM-DD-YY', '<?php echo($this->currentDateMDY); ?>', -1);</script>
+                                                    <script type="text/javascript">DateInput('dateEdit', true, (typeof window.CATSUserDateFormat !== 'undefined' ? window.CATSUserDateFormat : 'MM-DD-YY'), '<?php echo($_SESSION['CATS']->isDateDMY() ? DateUtility::getAdjustedDate('d-m-y') : $this->currentDateMDY); ?>', -1);</script>
                                                 </td>
                                             </tr>
 
diff --git a/modules/calendar/CalendarUI.js b/modules/calendar/CalendarUI.js
index 5d0755844..016c7fffe 100755
--- a/modules/calendar/CalendarUI.js
+++ b/modules/calendar/CalendarUI.js
@@ -188,8 +188,11 @@ function calendarEditEvent(entry)
         dayString = '0' + dayString;
     }
 
-    var dateString = monthString + '-' + dayString + '-' + yearString;
-    SetDateInputDate('dateEdit', 'MM-DD-YY', dateString);
+    var userDateFormat = (typeof window.CATSUserDateFormat !== 'undefined' ? window.CATSUserDateFormat : 'MM-DD-YY');
+    var dateString = (userDateFormat == 'DD-MM-YY'
+        ? dayString + '-' + monthString + '-' + yearString
+        : monthString + '-' + dayString + '-' + yearString);
+    SetDateInputDate('dateEdit', userDateFormat, dateString);
 
     if (entry.getData('allDay') != '1')
     {
@@ -377,8 +380,11 @@ function addEventByDay(year, month, day, hour)
         dayString = '0' + dayString;
     }
 
-    var dateString = monthString + '-' + dayString + '-' + yearString;
-    SetDateInputDate('dateAdd', 'MM-DD-YY', dateString);
+    var userDateFormat = (typeof window.CATSUserDateFormat !== 'undefined' ? window.CATSUserDateFormat : 'MM-DD-YY');
+    var dateString = (userDateFormat == 'DD-MM-YY'
+        ? dayString + '-' + monthString + '-' + yearString
+        : monthString + '-' + dayString + '-' + yearString);
+    SetDateInputDate('dateAdd', userDateFormat, dateString);
 
     document.getElementById('publicEntry').checked = defaultPublic;
 
diff --git a/modules/calendar/CalendarUI.php b/modules/calendar/CalendarUI.php
index 234a38d00..011c02f52 100755
--- a/modules/calendar/CalendarUI.php
+++ b/modules/calendar/CalendarUI.php
@@ -349,8 +349,11 @@ private function onAddEvent()
 
         /* Bail out if we received an invalid date. */
         $trimmedDate = $this->getTrimmedInput('dateAdd', $_POST);
+        $dateFormatFlag = $_SESSION['CATS']->isDateDMY()
+            ? DATE_FORMAT_DDMMYY
+            : DATE_FORMAT_MMDDYY;
         if (empty($trimmedDate) ||
-            !DateUtility::validate('-', $trimmedDate, DATE_FORMAT_MMDDYY))
+            !DateUtility::validate('-', $trimmedDate, $dateFormatFlag))
         {
             CommonErrors::fatal(COMMONERROR_BADFIELDS, $this, 'Invalid date.');
         }
@@ -409,7 +412,7 @@ private function onAddEvent()
         if ($allDay)
         {
             $date = DateUtility::convert(
-                '-', $trimmedDate, DATE_FORMAT_MMDDYY, DATE_FORMAT_YYYYMMDD
+                '-', $trimmedDate, $dateFormatFlag, DATE_FORMAT_YYYYMMDD
             );
 
             $hour = 12;
@@ -450,7 +453,7 @@ private function onAddEvent()
             $date = sprintf(
                 '%s %s',
                 DateUtility::convert(
-                    '-', $trimmedDate, DATE_FORMAT_MMDDYY, DATE_FORMAT_YYYYMMDD
+                    '-', $trimmedDate, $dateFormatFlag, DATE_FORMAT_YYYYMMDD
                 ),
                 date('H:i:00', $time)
             );
@@ -554,8 +557,11 @@ private function onEditEvent()
 
         /* Bail out if we received an invalid date. */
         $trimmedDate = $this->getTrimmedInput('dateEdit', $_POST);
+        $dateFormatFlag = $_SESSION['CATS']->isDateDMY()
+            ? DATE_FORMAT_DDMMYY
+            : DATE_FORMAT_MMDDYY;
         if (empty($trimmedDate) ||
-            !DateUtility::validate('-', $trimmedDate, DATE_FORMAT_MMDDYY))
+            !DateUtility::validate('-', $trimmedDate, $dateFormatFlag))
         {
             CommonErrors::fatal(COMMONERROR_BADFIELDS, $this, 'Invalid date.');
         }
@@ -599,7 +605,7 @@ private function onEditEvent()
         if ($allDay)
         {
             $date = DateUtility::convert(
-                '-', $trimmedDate, DATE_FORMAT_MMDDYY, DATE_FORMAT_YYYYMMDD
+                '-', $trimmedDate, $dateFormatFlag, DATE_FORMAT_YYYYMMDD
             );
 
             $hour = 12;
@@ -640,7 +646,7 @@ private function onEditEvent()
             $date = sprintf(
                 '%s %s',
                 DateUtility::convert(
-                    '-', $trimmedDate, DATE_FORMAT_MMDDYY, DATE_FORMAT_YYYYMMDD
+                    '-', $trimmedDate, $dateFormatFlag, DATE_FORMAT_YYYYMMDD
                 ),
                 date('H:i:00', $time)
             );
diff --git a/modules/candidates/Add.tpl b/modules/candidates/Add.tpl
index c56dcad6c..7dc96ee48 100755
--- a/modules/candidates/Add.tpl
+++ b/modules/candidates/Add.tpl
@@ -22,6 +22,10 @@
 
 <?php endif; ?>
 
+<script type="text/javascript">
+    window.CATSUserDateFormat = '<?php echo($_SESSION['CATS']->isDateDMY() ? 'DD-MM-YY' : 'MM-DD-YY'); ?>';
+</script>
+
             <p class="note<?php if ($this->isModal): ?>Unsized<?php endif; ?>">Basic Information</p>
 
             <table style="font-weight:bold; border: 1px solid #000; background-color: #ffed1a; padding:5px; display:none; margin-bottom:7px;" width="100%" id="candidateAlreadyInSystemTable">
@@ -416,7 +420,7 @@
                             <label id="dateAvailableLabel" for="dateAvailable">Date Available:</label>
                         </td>
                         <td class="tdData">
-                            <script type="text/javascript">DateInput('dateAvailable', false, 'MM-DD-YY', '', <?php echo($tabIndex++); ?>);</script>
+                            <script type="text/javascript">DateInput('dateAvailable', false, (typeof window.CATSUserDateFormat !== 'undefined' ? window.CATSUserDateFormat : 'MM-DD-YY'), '', <?php echo($tabIndex++); ?>);</script>
 
                             <?php /* DateInput()s take up 3 tabindexes. */ ?>
                             <?php $tabIndex += 2; ?>
diff --git a/modules/candidates/AddActivityChangeStatusModal.tpl b/modules/candidates/AddActivityChangeStatusModal.tpl
index 804d55d20..7472e9ebe 100755
--- a/modules/candidates/AddActivityChangeStatusModal.tpl
+++ b/modules/candidates/AddActivityChangeStatusModal.tpl
@@ -10,6 +10,7 @@
 <?php if (!$this->isFinishedMode): ?>
 
 <script type="text/javascript">
+    window.CATSUserDateFormat = '<?php echo($_SESSION['CATS']->isDateDMY() ? 'DD-MM-YY' : 'MM-DD-YY'); ?>';
     <?php if ($this->isJobOrdersMode): ?>
         statusesArray = new Array(1);
         jobOrdersArray = new Array(1);
@@ -154,7 +155,7 @@
                                     </div>
 
                                     <div style="margin-bottom: 4px;">
-                                        <script type="text/javascript">DateInput('dateAdd', true, 'MM-DD-YY', '', -1);</script>
+                                        <script type="text/javascript">DateInput('dateAdd', true, (typeof window.CATSUserDateFormat !== 'undefined' ? window.CATSUserDateFormat : 'MM-DD-YY'), '', -1);</script>
                                     </div>
 
                                     <div style="margin-bottom: 4px;">
diff --git a/modules/candidates/CandidatesUI.php b/modules/candidates/CandidatesUI.php
index 7b7d13aef..c3fdc30be 100755
--- a/modules/candidates/CandidatesUI.php
+++ b/modules/candidates/CandidatesUI.php
@@ -1136,19 +1136,10 @@ private function edit()
             $emailTemplateDisabled = false;
         }
 
-        /* Date format for DateInput()s. */
-        if ($_SESSION['CATS']->isDateDMY())
-        {
-            $data['dateAvailableMDY'] = DateUtility::convert(
-                '-', $data['dateAvailable'], DATE_FORMAT_DDMMYY, DATE_FORMAT_MMDDYY
-            );
-        }
-        else
-        {
-            $data['dateAvailableMDY'] = $data['dateAvailable'];
-        }
-
-        if (!eval(Hooks::get('CANDIDATE_EDIT'))) return;
+        /* Date format for DateInput()s. */
+        $data['dateAvailableUser'] = $data['dateAvailable'];
+
+        if (!eval(Hooks::get('CANDIDATE_EDIT'))) return;
 
         $EEOSettings = new EEOSettings($this->_siteID);
         $EEOSettingsRS = $EEOSettings->getAll();
@@ -1158,14 +1149,14 @@ private function edit()
         $this->_template->assign('usersRS', $usersRS);
         $this->_template->assign('extraFieldRS', $extraFieldRS);
         $this->_template->assign('sourcesRS', $sourcesRS);
-        $this->_template->assign('sourcesString', $sourcesString);
-        $this->_template->assign('sourceInRS', $sourceInRS);
-        $this->_template->assign('candidateID', $candidateID);
-        $this->_template->assign('canEmail', $canEmail);
-        $this->_template->assign('EEOSettingsRS', $EEOSettingsRS);
-        $this->_template->assign('emailTemplateDisabled', $emailTemplateDisabled);
-        $this->_template->display('./modules/candidates/Edit.tpl');
-    }
+        $this->_template->assign('sourcesString', $sourcesString);
+        $this->_template->assign('sourceInRS', $sourceInRS);
+        $this->_template->assign('candidateID', $candidateID);
+        $this->_template->assign('canEmail', $canEmail);
+        $this->_template->assign('EEOSettingsRS', $EEOSettingsRS);
+        $this->_template->assign('emailTemplateDisabled', $emailTemplateDisabled);
+        $this->_template->display('./modules/candidates/Edit.tpl');
+    }
 
     /*
      * Called by handleRequest() to process saving / submitting the edit page.
@@ -1190,19 +1181,22 @@ private function onEdit()
         /* Bail out if we received an invalid availability date; if not, go
          * ahead and convert the date to MySQL format.
          */
-        $dateAvailable = $this->getTrimmedInput('dateAvailable', $_POST);
-        if (!empty($dateAvailable))
-        {
-            if (!DateUtility::validate('-', $dateAvailable, DATE_FORMAT_MMDDYY))
-            {
-                CommonErrors::fatal(COMMONERROR_MISSINGFIELDS, $this, 'Invalid availability date.');
-            }
-
-            /* Convert start_date to something MySQL can understand. */
-            $dateAvailable = DateUtility::convert(
-                '-', $dateAvailable, DATE_FORMAT_MMDDYY, DATE_FORMAT_YYYYMMDD
-            );
-        }
+        $dateAvailable = $this->getTrimmedInput('dateAvailable', $_POST);
+        $dateFormatFlag = $_SESSION['CATS']->isDateDMY()
+            ? DATE_FORMAT_DDMMYY
+            : DATE_FORMAT_MMDDYY;
+        if (!empty($dateAvailable))
+        {
+            if (!DateUtility::validate('-', $dateAvailable, $dateFormatFlag))
+            {
+                CommonErrors::fatal(COMMONERROR_MISSINGFIELDS, $this, 'Invalid availability date.');
+            }
+
+            /* Convert start_date to something MySQL can understand. */
+            $dateAvailable = DateUtility::convert(
+                '-', $dateAvailable, $dateFormatFlag, DATE_FORMAT_YYYYMMDD
+            );
+        }
 
         $formattedPhoneHome = StringUtility::extractPhoneNumber(
             $this->getSanitisedInput('phoneHome', $_POST)
@@ -2531,19 +2525,22 @@ private function _addCandidate($isModal, $directoryOverride = '')
         /* Bail out if we received an invalid availability date; if not, go
          * ahead and convert the date to MySQL format.
          */
-        $dateAvailable = $this->getTrimmedInput('dateAvailable', $_POST);
-        if (!empty($dateAvailable))
-        {
-            if (!DateUtility::validate('-', $dateAvailable, DATE_FORMAT_MMDDYY))
-            {
-                $this->$fatal('Invalid availability date.', $moduleDirectory);
-            }
-
-            /* Convert start_date to something MySQL can understand. */
-            $dateAvailable = DateUtility::convert(
-                '-', $dateAvailable, DATE_FORMAT_MMDDYY, DATE_FORMAT_YYYYMMDD
-            );
-        }
+        $dateAvailable = $this->getTrimmedInput('dateAvailable', $_POST);
+        $dateFormatFlag = $_SESSION['CATS']->isDateDMY()
+            ? DATE_FORMAT_DDMMYY
+            : DATE_FORMAT_MMDDYY;
+        if (!empty($dateAvailable))
+        {
+            if (!DateUtility::validate('-', $dateAvailable, $dateFormatFlag))
+            {
+                $this->$fatal('Invalid availability date.', $moduleDirectory);
+            }
+
+            /* Convert start_date to something MySQL can understand. */
+            $dateAvailable = DateUtility::convert(
+                '-', $dateAvailable, $dateFormatFlag, DATE_FORMAT_YYYYMMDD
+            );
+        }
 
         $formattedPhoneHome = StringUtility::extractPhoneNumber(
             $this->getTrimmedInput('phoneHome', $_POST)
@@ -3066,15 +3063,18 @@ private function _addActivityChangeStatus($isJobOrdersMode, $regardingID,
             }
         }
 
-        if ($this->isChecked('scheduleEvent', $_POST))
-        {
-            /* Bail out if we received an invalid date. */
-            $trimmedDate = $this->getTrimmedInput('dateAdd', $_POST);
-            if (empty($trimmedDate) ||
-                !DateUtility::validate('-', $trimmedDate, DATE_FORMAT_MMDDYY))
-            {
-                CommonErrors::fatalModal(COMMONERROR_MISSINGFIELDS, $this, 'Invalid date.');
-            }
+        if ($this->isChecked('scheduleEvent', $_POST))
+        {
+            /* Bail out if we received an invalid date. */
+            $trimmedDate = $this->getTrimmedInput('dateAdd', $_POST);
+            $dateFormatFlag = $_SESSION['CATS']->isDateDMY()
+                ? DATE_FORMAT_DDMMYY
+                : DATE_FORMAT_MMDDYY;
+            if (empty($trimmedDate) ||
+                !DateUtility::validate('-', $trimmedDate, $dateFormatFlag))
+            {
+                CommonErrors::fatalModal(COMMONERROR_MISSINGFIELDS, $this, 'Invalid date.');
+            }
 
             /* Bail out if we don't have a valid event type. */
             if (!$this->isRequiredIDValid('eventTypeID', $_POST))
@@ -3108,13 +3108,13 @@ private function _addActivityChangeStatus($isJobOrdersMode, $regardingID,
             $duration = $this->getTrimmedInput('duration', $_POST);;
 
             /* Is this a scheduled event or an all day event? */
-            if ($allDay)
-            {
-                $date = DateUtility::convert(
-                    '-', $trimmedDate, DATE_FORMAT_MMDDYY, DATE_FORMAT_YYYYMMDD
-                );
-
-                $hour = 12;
+            if ($allDay)
+            {
+                $date = DateUtility::convert(
+                    '-', $trimmedDate, $dateFormatFlag, DATE_FORMAT_YYYYMMDD
+                );
+
+                $hour = 12;
                 $minute = 0;
                 $meridiem = 'AM';
             }
@@ -3151,16 +3151,16 @@ private function _addActivityChangeStatus($isJobOrdersMode, $regardingID,
                 );
 
                 /* Create MySQL date string w/ 24hr time (YYYY-MM-DD HH:MM:SS). */
-                $date = sprintf(
-                    '%s %s',
-                    DateUtility::convert(
-                        '-',
-                        $trimmedDate,
-                        DATE_FORMAT_MMDDYY,
-                        DATE_FORMAT_YYYYMMDD
-                    ),
-                    date('H:i:00', $time)
-                );
+                $date = sprintf(
+                    '%s %s',
+                    DateUtility::convert(
+                        '-',
+                        $trimmedDate,
+                        $dateFormatFlag,
+                        DATE_FORMAT_YYYYMMDD
+                    ),
+                    date('H:i:00', $time)
+                );
             }
 
             $description = $this->getTrimmedInput('description', $_POST);
diff --git a/modules/candidates/Edit.tpl b/modules/candidates/Edit.tpl
index aeb5c7987..a52ffe68b 100755
--- a/modules/candidates/Edit.tpl
+++ b/modules/candidates/Edit.tpl
@@ -2,6 +2,9 @@
 <?php TemplateUtility::printHeader('Candidates', array('modules/candidates/validator.js', 'js/sweetTitles.js', 'js/listEditor.js', 'js/doubleListEditor.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active); ?>
+    <script type="text/javascript">
+        window.CATSUserDateFormat = '<?php echo($_SESSION['CATS']->isDateDMY() ? 'DD-MM-YY' : 'MM-DD-YY'); ?>';
+    </script>
     <div id="main">
         <?php TemplateUtility::printQuickSearch(); ?>
 
@@ -334,10 +337,10 @@
                             <label id="dateAvailableLabel" for="dateAvailable">Date Available:</label>
                         </td>
                         <td class="tdData">
-                            <?php if (!empty($this->data['dateAvailable'])): ?>
-                                <script type="text/javascript">DateInput('dateAvailable', false, 'MM-DD-YY', '<?php echo($this->data['dateAvailableMDY']); ?>', -1);</script>
+<?php if (!empty($this->data['dateAvailable'])): ?>
+                                <script type="text/javascript">DateInput('dateAvailable', false, (typeof window.CATSUserDateFormat !== 'undefined' ? window.CATSUserDateFormat : 'MM-DD-YY'), '<?php echo($this->data['dateAvailableUser']); ?>', -1);</script>
                             <?php else: ?>
-                                <script type="text/javascript">DateInput('dateAvailable', false, 'MM-DD-YY', '', -1);</script>
+                                <script type="text/javascript">DateInput('dateAvailable', false, (typeof window.CATSUserDateFormat !== 'undefined' ? window.CATSUserDateFormat : 'MM-DD-YY'), '', -1);</script>
                             <?php endif; ?>
                         </td>
                     </tr>
diff --git a/modules/candidates/Show.tpl b/modules/candidates/Show.tpl
index 92ca84f4e..1ecebd25c 100755
--- a/modules/candidates/Show.tpl
+++ b/modules/candidates/Show.tpl
@@ -14,6 +14,10 @@ use OpenCATS\UI\CandidateDuplicateQuickActionMenu;
             <?php TemplateUtility::printQuickSearch(); ?>
 <?php endif; ?>
 
+        <script type="text/javascript">
+            window.CATSUserDateFormat = '<?php echo($_SESSION['CATS']->isDateDMY() ? 'DD-MM-YY' : 'MM-DD-YY'); ?>';
+        </script>
+
         <div id="contents">
             <table>
                 <tr>
diff --git a/modules/contacts/AddActivityScheduleEventModal.tpl b/modules/contacts/AddActivityScheduleEventModal.tpl
index c30144410..504895d46 100755
--- a/modules/contacts/AddActivityScheduleEventModal.tpl
+++ b/modules/contacts/AddActivityScheduleEventModal.tpl
@@ -3,13 +3,14 @@
 <?php if(!$this->onlyScheduleEvent): ?>
 <?php TemplateUtility::printModalHeader('Contacts', array('modules/contacts/activityvalidator.js', 'js/activity.js'), 'Contacts: Log Activity'); ?>
 <?php else: ?>
-    <?php TemplateUtility::printModalHeader('Contacts', array('modules/contacts/activityvalidator.js', 'js/activity.js'), 'Contacts: Schedule Event'); ?>
-<?php endif; ?>
-
-<?php if (!$this->isFinishedMode): ?>
-
-<script type="text/javascript">
-</script>
+<?php TemplateUtility::printModalHeader('Contacts', array('modules/contacts/activityvalidator.js', 'js/activity.js'), 'Contacts: Schedule Event'); ?>
+<?php endif; ?>
+
+<?php if (!$this->isFinishedMode): ?>
+
+<script type="text/javascript">
+    window.CATSUserDateFormat = '<?php echo($_SESSION['CATS']->isDateDMY() ? 'DD-MM-YY' : 'MM-DD-YY'); ?>';
+</script>
 
     <form name="logActivityForm" id="logActivityForm" action="<?php echo(CATSUtility::getIndexName()); ?>?m=contacts&amp;a=addActivityScheduleEvent<?php if($this->onlyScheduleEvent): ?>&amp;onlyScheduleEvent=true<?php endif; ?>" method="post" autocomplete="off">
         <input type="hidden" name="postback" id="postback" value="postback" />
@@ -72,9 +73,9 @@
                                         </select>
                                     </div>
 
-                                    <div style="margin-bottom: 4px;">
-                                        <script type="text/javascript">DateInput('dateAdd', true, 'MM-DD-YY', '', -1);</script>
-                                    </div>
+                                    <div style="margin-bottom: 4px;">
+                                        <script type="text/javascript">DateInput('dateAdd', true, (typeof window.CATSUserDateFormat !== 'undefined' ? window.CATSUserDateFormat : 'MM-DD-YY'), '', -1);</script>
+                                    </div>
 
                                     <div style="margin-bottom: 4px;">
                                         <input type="radio" name="allDay" id="allDay0" value="0" style="margin-left: 0px" checked onchange="AS_onEventAllDayChange('allDay1');" />
diff --git a/modules/contacts/ContactsUI.php b/modules/contacts/ContactsUI.php
index c7a9bf28d..81f8c917d 100755
--- a/modules/contacts/ContactsUI.php
+++ b/modules/contacts/ContactsUI.php
@@ -1376,8 +1376,11 @@ private function _addActivityScheduleEvent($regardingID, $directoryOverride = ''
         {
             /* Bail out if we received an invalid date. */
             $trimmedDate = $this->getSanitisedInput('dateAdd', $_POST);
+            $dateFormatFlag = $_SESSION['CATS']->isDateDMY()
+                ? DATE_FORMAT_DDMMYY
+                : DATE_FORMAT_MMDDYY;
             if (empty($trimmedDate) ||
-                !DateUtility::validate('-', $trimmedDate, DATE_FORMAT_MMDDYY))
+                !DateUtility::validate('-', $trimmedDate, $dateFormatFlag))
             {
                 CommonErrors::fatalModal(COMMONERROR_MISSINGFIELDS, $this, 'Invalid date.');
             }
@@ -1418,7 +1421,7 @@ private function _addActivityScheduleEvent($regardingID, $directoryOverride = ''
             if ($allDay)
             {
                 $date = DateUtility::convert(
-                    '-', $trimmedDate, DATE_FORMAT_MMDDYY, DATE_FORMAT_YYYYMMDD
+                    '-', $trimmedDate, $dateFormatFlag, DATE_FORMAT_YYYYMMDD
                 );
 
                 $hour = 12;
@@ -1461,7 +1464,7 @@ private function _addActivityScheduleEvent($regardingID, $directoryOverride = ''
                     DateUtility::convert(
                         '-',
                         $trimmedDate,
-                        DATE_FORMAT_MMDDYY,
+                        $dateFormatFlag,
                         DATE_FORMAT_YYYYMMDD
                     ),
                     date('H:i:00', $time)
diff --git a/modules/contacts/Show.tpl b/modules/contacts/Show.tpl
index 603b3c354..cf6955250 100755
--- a/modules/contacts/Show.tpl
+++ b/modules/contacts/Show.tpl
@@ -6,6 +6,9 @@ use OpenCATS\UI\QuickActionMenu;
 <?php TemplateUtility::printHeader('Contact - '.$this->data['firstName'].' '.$this->data['lastName'], array( 'js/activity.js', 'js/attachment.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active); ?>
+    <script type="text/javascript">
+        window.CATSUserDateFormat = '<?php echo($_SESSION['CATS']->isDateDMY() ? 'DD-MM-YY' : 'MM-DD-YY'); ?>';
+    </script>
     <div id="main">
         <?php TemplateUtility::printQuickSearch(); ?>
 
diff --git a/modules/joborders/Add.tpl b/modules/joborders/Add.tpl
index ca1ad96f2..3040d1db4 100755
--- a/modules/joborders/Add.tpl
+++ b/modules/joborders/Add.tpl
@@ -2,6 +2,9 @@
 <?php TemplateUtility::printHeader('Job Orders', array('modules/joborders/validator.js',  'js/company.js', 'js/sweetTitles.js', 'js/suggest.js', 'js/joborder.js', 'js/lib.js', 'js/listEditor.js', 'vendor/ckeditor/ckeditor/ckeditor.js', 'js/ckeditor-manager.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active, $this->subActive); ?>
+    <script type="text/javascript">
+        window.CATSUserDateFormat = '<?php echo($_SESSION['CATS']->isDateDMY() ? 'DD-MM-YY' : 'MM-DD-YY'); ?>';
+    </script>
     <div id="main">
         <?php TemplateUtility::printQuickSearch(); ?>
 
@@ -44,7 +47,7 @@
                                 <label id="startDateLabel" for="startDate">Start Date:</label>
                             </td>
                             <td class="tdData">
-                                <script type="text/javascript">DateInput('startDate', false, 'MM-DD-YY', '', 8);</script>
+                                <script type="text/javascript">DateInput('startDate', false, (typeof window.CATSUserDateFormat !== 'undefined' ? window.CATSUserDateFormat : 'MM-DD-YY'), '', 8);</script>
                             </td>
                         </tr>
 
diff --git a/modules/joborders/Edit.tpl b/modules/joborders/Edit.tpl
index d8f6fc0ec..bbc7c7985 100755
--- a/modules/joborders/Edit.tpl
+++ b/modules/joborders/Edit.tpl
@@ -2,6 +2,9 @@
 <?php TemplateUtility::printHeader('Job Orders', array('modules/joborders/validator.js', 'js/company.js', 'js/sweetTitles.js',  'js/suggest.js', 'js/joborder.js', 'js/lib.js', 'js/listEditor.js', 'vendor/ckeditor/ckeditor/ckeditor.js', 'js/ckeditor-manager.js')); ?>
 <?php TemplateUtility::printHeaderBlock(); ?>
 <?php TemplateUtility::printTabs($this->active); ?>
+    <script type="text/javascript">
+        window.CATSUserDateFormat = '<?php echo($_SESSION['CATS']->isDateDMY() ? 'DD-MM-YY' : 'MM-DD-YY'); ?>';
+    </script>
     <div id="main">
         <?php TemplateUtility::printQuickSearch(); ?>
 
@@ -34,10 +37,10 @@
                             <label id="startDateLabel" for="startDate">Start Date:</label>
                         </td>
                         <td class="tdData">
-                            <?php if (!empty($this->data['startDate'])): ?>
-                                <script type="text/javascript">DateInput('startDate', false, 'MM-DD-YY', '<?php echo($this->data['startDateMDY']); ?>', 9);</script>
+<?php if (!empty($this->data['startDate'])): ?>
+                                <script type="text/javascript">DateInput('startDate', false, (typeof window.CATSUserDateFormat !== 'undefined' ? window.CATSUserDateFormat : 'MM-DD-YY'), '<?php echo($this->data['startDateUser']); ?>', 9);</script>
                             <?php else: ?>
-                                <script type="text/javascript">DateInput('startDate', false, 'MM-DD-YY', '', 9);</script>
+                                <script type="text/javascript">DateInput('startDate', false, (typeof window.CATSUserDateFormat !== 'undefined' ? window.CATSUserDateFormat : 'MM-DD-YY'), '', 9);</script>
                             <?php endif; ?>
                         </td>
                     </tr>
diff --git a/modules/joborders/JobOrdersUI.php b/modules/joborders/JobOrdersUI.php
index ce7ae0f02..b3a308bf7 100755
--- a/modules/joborders/JobOrdersUI.php
+++ b/modules/joborders/JobOrdersUI.php
@@ -722,16 +722,19 @@ private function onAdd()
          * convert the date to MySQL format.
          */
         $startDate = $this->getTrimmedInput('startDate', $_POST);
+        $dateFormatFlag = $_SESSION['CATS']->isDateDMY()
+            ? DATE_FORMAT_DDMMYY
+            : DATE_FORMAT_MMDDYY;
         if (!empty($startDate))
         {
-            if (!DateUtility::validate('-', $startDate, DATE_FORMAT_MMDDYY))
+            if (!DateUtility::validate('-', $startDate, $dateFormatFlag))
             {
                 CommonErrors::fatal(COMMONERROR_MISSINGFIELDS, $this, 'Invalid start date.');
             }
 
             /* Convert start_date to something MySQL can understand. */
             $startDate = DateUtility::convert(
-                '-', $startDate, DATE_FORMAT_MMDDYY, DATE_FORMAT_YYYYMMDD
+                '-', $startDate, $dateFormatFlag, DATE_FORMAT_YYYYMMDD
             );
         }
 
@@ -873,16 +876,7 @@ private function edit()
         $departmentsString = ListEditor::getStringFromList($departmentsRS, 'name');
 
         /* Date format for DateInput()s. */
-        if ($_SESSION['CATS']->isDateDMY())
-        {
-            $data['startDateMDY'] = DateUtility::convert(
-                '-', $data['startDate'], DATE_FORMAT_DDMMYY, DATE_FORMAT_MMDDYY
-            );
-        }
-        else
-        {
-            $data['startDateMDY'] = $data['startDate'];
-        }
+        $data['startDateUser'] = $data['startDate'];
 
         /* Get extra fields. */
         $extraFieldRS = $jobOrders->extraFields->getValuesForEdit($jobOrderID);
@@ -986,9 +980,12 @@ private function onEdit()
          * convert the date to MySQL format.
          */
         $startDate = $this->getTrimmedInput('startDate', $_POST);
+        $dateFormatFlag = $_SESSION['CATS']->isDateDMY()
+            ? DATE_FORMAT_DDMMYY
+            : DATE_FORMAT_MMDDYY;
         if (!empty($startDate))
         {
-            if (!DateUtility::validate('-', $startDate, DATE_FORMAT_MMDDYY))
+            if (!DateUtility::validate('-', $startDate, $dateFormatFlag))
             {
                 CommonErrors::fatal(COMMONERROR_MISSINGFIELDS, $this, 'Invalid start date.');
                 return;
@@ -996,7 +993,7 @@ private function onEdit()
 
             /* Convert start_date to something MySQL can understand. */
             $startDate = DateUtility::convert(
-                '-', $startDate, DATE_FORMAT_MMDDYY, DATE_FORMAT_YYYYMMDD
+                '-', $startDate, $dateFormatFlag, DATE_FORMAT_YYYYMMDD
             );
         }