diff --git a/forms/DMYCalendarDateField.php b/forms/DMYCalendarDateField.php
index 2b2f192f3..586db3cb6 100755
--- a/forms/DMYCalendarDateField.php
+++ b/forms/DMYCalendarDateField.php
@@ -71,7 +71,7 @@ Behaviour.register({
 			if(day_value || month_value || year_value){
 				var value = day_value + '/' + month_value + '/' + year_value;
 
-				if(value && value.length > 0 && !value.match(/^[0-9]{1,2}\/[0-9]{1,2}\/[0-90-9]{2,4}\$/)) {
+				if(value && value.length > 0 && !value.match(/^[0-9]{1,2}\/[0-9]{1,2}\/([0-9][0-9]){1,2}\$/)) {
 					validationError(_CURRENT_FORM.elements[fieldName+'[Day]'],"$error","validation",false);
 					return false;
 				}
diff --git a/forms/DMYDateField.php b/forms/DMYDateField.php
index ac448a5ae..36c3efa06 100644
--- a/forms/DMYDateField.php
+++ b/forms/DMYDateField.php
@@ -56,7 +56,7 @@ HTML;
 	
 	function validate($validator) 
  	{ 
- 		if(!empty ($this->value) && !preg_match('/^[0-90-9]{2,4}\-[0-9]{1,2}\-[0-90-9]{1,2}$/', $this->value)) 
+ 		if(!empty ($this->value) && !preg_match('/^([0-9][0-9]){1,2}\-[0-9]{1,2}\-[0-9]{1,2}$/', $this->value)) 
  		{ 
  			$validator->validationError( 
  				$this->name,  
@@ -83,7 +83,7 @@ Behaviour.register({
 			if(day_value || month_value || year_value){
 				var value = day_value + '/' + month_value + '/' + year_value;
 
-				if(value && value.length > 0 && !value.match(/^[0-9]{1,2}\/[0-9]{1,2}\/[0-90-9]{2,4}\$/)) {
+				if(value && value.length > 0 && !value.match(/^[0-9]{1,2}\/[0-9]{1,2}\/([0-9][0-9]){1,2}\$/)) {
 					validationError(_CURRENT_FORM.elements[fieldName+'[Day]'],"$error","validation",false);
 					return false;
 				}