diff --git a/source/java/org/alfresco/web/bean/users/CreateUserWizard.java b/source/java/org/alfresco/web/bean/users/CreateUserWizard.java
index 60d92370d5..39cac99240 100644
--- a/source/java/org/alfresco/web/bean/users/CreateUserWizard.java
+++ b/source/java/org/alfresco/web/bean/users/CreateUserWizard.java
@@ -60,6 +60,7 @@ import org.alfresco.web.ui.common.ReportedException;
 import org.alfresco.web.ui.common.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.commons.validator.routines.EmailValidator;
 
 /**
  * @author Kevin Roast
@@ -73,6 +74,7 @@ public class CreateUserWizard extends BaseWizardBean
     protected static final String ERROR_DOMAIN_MISMATCH = "error_domain_mismatch";
     
     private static final String MSG_ERROR_NEWUSER_HOME_SPACE = "error_newuser_home_space";
+    private static final String MSG_ERROR_MAIL_NOT_VALID = "email_format_is_not_valid";
     
     protected static final String QUOTA_UNITS_KB = "kilobyte";
     protected static final String QUOTA_UNITS_MB = "megabyte";
@@ -621,6 +623,24 @@ public class CreateUserWizard extends BaseWizardBean
         }
     }
 
+    /**
+     * Validate Email field data is acceptable
+     *
+     * @param context
+     * @param component
+     * @param value
+     * @throws ValidatorException
+     */
+    public void validateEmail(FacesContext context, UIComponent component, Object value) throws ValidatorException
+    {
+        EmailValidator emailValidator = EmailValidator.getInstance();
+        if (!emailValidator.isValid((String) value))
+        {
+            String err = Application.getMessage(context, MSG_ERROR_MAIL_NOT_VALID);
+            throw new ValidatorException(new FacesMessage(err));
+        }
+    }
+
     // ------------------------------------------------------------------------------
     // Helper methods
 
diff --git a/source/web/jsp/users/new-user-wizard/person-properties.jsp b/source/web/jsp/users/new-user-wizard/person-properties.jsp
index 5517d96180..bf58e90f00 100644
--- a/source/web/jsp/users/new-user-wizard/person-properties.jsp
+++ b/source/web/jsp/users/new-user-wizard/person-properties.jsp
@@ -61,7 +61,7 @@
    
    <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
    <h:outputText value="#{msg.email}"/>
-   <h:inputText id="email" value="#{WizardManager.bean.email}" disabled="#{WizardManager.bean.personPropertiesImmutability.email == true}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" />
+    <h:inputText id="email" value="#{WizardManager.bean.email}" validator="#{WizardManager.bean.validateEmail}" disabled="#{WizardManager.bean.personPropertiesImmutability.email == true}" size="35" maxlength="1024" onkeyup="updateButtonState();" onchange="updateButtonState();" />
 </h:panelGrid>
 
 <h:panelGrid columns="1" cellpadding="2" style="padding-top: 4px; padding-bottom: 4px;"