diff --git a/source/java/org/alfresco/web/bean/users/CreateUserWizard.java b/source/java/org/alfresco/web/bean/users/CreateUserWizard.java
index 39cac99240..9496477c52 100644
--- a/source/java/org/alfresco/web/bean/users/CreateUserWizard.java
+++ b/source/java/org/alfresco/web/bean/users/CreateUserWizard.java
@@ -25,6 +25,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.ResourceBundle;
+import java.util.regex.Pattern;
 
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
@@ -123,7 +124,6 @@ public class CreateUserWizard extends BaseWizardBean
     /** ref to the default home location */
     private NodeRef defaultHomeSpaceRef;
 
-
     /**
      * @param authenticationService The AuthenticationService to set.
      */
@@ -633,8 +633,9 @@ public class CreateUserWizard extends BaseWizardBean
      */
     public void validateEmail(FacesContext context, UIComponent component, Object value) throws ValidatorException
     {
-        EmailValidator emailValidator = EmailValidator.getInstance();
-        if (!emailValidator.isValid((String) value))
+    	String emailRegExp = Application.getClientConfig(context).getEmailRegExp();
+    	Pattern pattern = Pattern.compile(emailRegExp, Pattern.CASE_INSENSITIVE);
+    	if (!pattern.matcher((CharSequence) value).matches())
         {
             String err = Application.getMessage(context, MSG_ERROR_MAIL_NOT_VALID);
             throw new ValidatorException(new FacesMessage(err));
diff --git a/source/java/org/alfresco/web/config/ClientConfigElement.java b/source/java/org/alfresco/web/config/ClientConfigElement.java
index 7d123329e8..34e63a06b2 100644
--- a/source/java/org/alfresco/web/config/ClientConfigElement.java
+++ b/source/java/org/alfresco/web/config/ClientConfigElement.java
@@ -87,7 +87,7 @@ public class ClientConfigElement extends ConfigElementAdapter
    private boolean checkContextAgainstPath = false;
    private boolean allowUserScriptExecute = false;
    private boolean isBulkFetchEnabled = true;
-   
+   private String emailRegExp = "^([-A-Za-z0-9\\xc0-\\xff!#$%&'*+\\/=?^_`{}~|]+\\.)*[-A-Za-z0-9\\xc0-\\xff!#$%&'*+\\/=?^_`{}|~_]+@([\\.A-Za-z0-9_-])*[A-Za-z0-9_-]$";
    
    /**
     * Default Constructor
@@ -981,4 +981,12 @@ public class ClientConfigElement extends ConfigElementAdapter
        this.isBulkFetchEnabled = isBulkFetchEnabled;
    }
    
+   /**
+    * @return regexp for email validation
+    */
+   public String getEmailRegExp()
+   {
+       return emailRegExp;
+   }
+   
 }