diff --git a/forms/DateField.php b/forms/DateField.php
index 528d19da2..524c79c48 100755
--- a/forms/DateField.php
+++ b/forms/DateField.php
@@ -99,8 +99,11 @@ class DateField_Disabled extends DateField {
 	protected $disabled = true;
 	
 	function setValue($val) {
-		if($val && $val != "0000-00-00") $this->value = date('d/m/Y', strtotime($val));
-		else $this->value = '('._t('DateField.NODATESET', 'No date set').')';
+		if(is_string($val) && preg_match('/^([\d]{2,4})-([\d]{1,2})-([\d]{1,2})/', $val)) {
+			$this->value = preg_replace('/^([\d]{2,4})-([\d]{1,2})-([\d]{1,2})/','\\3/\\2/\\1', $val);
+		} else {
+			$this->value = $val;
+		}
 	}
 	
 	function Field() {
@@ -136,4 +139,4 @@ class DateField_Disabled extends DateField {
 		return true;	
 	}
 }
-?>
\ No newline at end of file
+?>