diff --git a/forms/DateField.php b/forms/DateField.php
index 7469cd4c5..335deae33 100755
--- a/forms/DateField.php
+++ b/forms/DateField.php
@@ -151,8 +151,8 @@ class DateField extends TextField {
 					$this->value = $this->valueObj->toArray();
 				}
 				// load ISO date from database (usually through Form->loadDataForm())
-				else if(!empty($val) && Zend_Date::isDate($val, $this->getConfig('datavalueformat'))) {
-					$this->valueObj = new Zend_Date($val, $this->getConfig('datavalueformat'));
+				else if(!empty($val) && Zend_Date::isDate($val, $this->getConfig('datavalueformat'), $this->locale)) {
+					$this->valueObj = new Zend_Date($val, $this->getConfig('datavalueformat'), $this->locale);
 					$this->value = $this->valueObj->toArray();
 				}
 				else {
@@ -166,12 +166,13 @@ class DateField extends TextField {
 				// (en_NZ for 3rd of April, definetly not yyyy-MM-dd)
 				if(!empty($val) && Zend_Date::isDate($val, $this->getConfig('dateformat'), $this->locale)) {
 					$this->valueObj = new Zend_Date($val, $this->getConfig('dateformat'), $this->locale);
-					$this->value = $this->valueObj->get($this->getConfig('dateformat'));
+					$this->value = $this->valueObj->get($this->getConfig('dateformat'), $this->locale);
+					
 				}
 				// load ISO date from database (usually through Form->loadDataForm())
 				else if(!empty($val) && Zend_Date::isDate($val, $this->getConfig('datavalueformat'))) {
 					$this->valueObj = new Zend_Date($val, $this->getConfig('datavalueformat'));
-					$this->value = $this->valueObj->get($this->getConfig('dateformat'));
+					$this->value = $this->valueObj->get($this->getConfig('dateformat'), $this->locale);
 				}
 				else {
 					$this->value = $val;
diff --git a/forms/DatetimeField.php b/forms/DatetimeField.php
index 6b9922035..e36fbacf7 100644
--- a/forms/DatetimeField.php
+++ b/forms/DatetimeField.php
@@ -72,10 +72,10 @@ class DatetimeField extends FormField {
 				if($this->dateField->getConfig('dmyfields')) {
 					$this->dateField->setValue($valueObj->toArray());
 				} else {
-					$this->dateField->setValue($valueObj->get($this->dateField->getConfig('dateformat')));
+					$this->dateField->setValue($valueObj->get($this->dateField->getConfig('dateformat'), $this->locale));
 				}
 				// set time
-				$this->timeField->setValue($valueObj->get($this->timeField->getConfig('timeformat')));
+				$this->timeField->setValue($valueObj->get($this->timeField->getConfig('timeformat'), $this->locale));
 			}
 			// Setting from form submission
 			elseif(is_array($val) && array_key_exists('date', $val) && array_key_exists('time', $val)) {