diff --git a/forms/EmailField.php b/forms/EmailField.php
index e27cb8c0a..059b90295 100755
--- a/forms/EmailField.php
+++ b/forms/EmailField.php
@@ -16,7 +16,7 @@ Behaviour.register({
 			var el = _CURRENT_FORM.elements[fieldName];
 			if(!el || !el.value) return true;
 
-		 	if(el.value.match(/^([a-zA-Z0-9_+\-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/)) {
+		 	if(el.value.match(/^([a-zA-Z0-9_+\-\.\x27]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/)) {
 		 		return true;
 		 	} else {
 				validationError(el, "$error","validation");
@@ -42,7 +42,7 @@ JS;
 	
 	function validate($validator){
 		$this->value = trim($this->value);
-		if($this->value && !ereg('^([a-zA-Z0-9_+\.\-]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$', $this->value)){
+		if($this->value && !ereg('^([a-zA-Z0-9_+\.\-\x27]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$', $this->value)){
  			$validator->validationError(
  				$this->name,
 				_t('EmailField.VALIDATION', "Please enter an email address."),