diff --git a/config/alfresco/web-client-config.xml b/config/alfresco/web-client-config.xml
index 6f53b610e8..b61dffde17 100644
--- a/config/alfresco/web-client-config.xml
+++ b/config/alfresco/web-client-config.xml
@@ -93,6 +93,9 @@
          <username-min-length>2</username-min-length>
          <password-min-length>3</password-min-length>
 
+         <!-- maximum length for password -->
+         <password-max-length>255</password-max-length>
+
          <!-- minimum length for group name -->
          <group-name-min-length>3</group-name-min-length>
 
diff --git a/source/java/org/alfresco/web/bean/LoginBean.java b/source/java/org/alfresco/web/bean/LoginBean.java
index df6f87d207..08dc752dd1 100644
--- a/source/java/org/alfresco/web/bean/LoginBean.java
+++ b/source/java/org/alfresco/web/bean/LoginBean.java
@@ -27,6 +27,7 @@ import java.util.Map;
 
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
+import javax.faces.component.UIInput;
 import javax.faces.context.FacesContext;
 import javax.faces.validator.ValidatorException;
 
@@ -44,6 +45,7 @@ import org.alfresco.web.app.servlet.AuthenticationHelper;
 import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.bean.repository.User;
 import org.alfresco.web.bean.users.UserPreferencesBean;
+import org.alfresco.web.bean.users.UsersDialog;
 import org.alfresco.web.ui.common.PanelGenerator;
 import org.alfresco.web.ui.common.Utils;
 import org.apache.commons.logging.Log;
@@ -262,6 +264,29 @@ public class LoginBean implements Serializable
    // ------------------------------------------------------------------------------
    // Validator methods
 
+   /**
+    *  Validate that field "confirm" matches to the field "password" 
+    */
+   public void validateMatch(FacesContext context, UIComponent component, Object value)
+         throws ValidatorException
+   {
+       String confirm = (String)value;
+       
+       String field1Id = (String) component.getAttributes().get("passwd1Id");
+       UIInput passComponent = (UIInput) context.getViewRoot().findComponent(field1Id);
+       String pass = (String) passComponent.getSubmittedValue();
+       if (pass == null)
+       {
+           pass = (String) passComponent.getValue();
+       }
+       
+       if (!pass.equals(confirm))
+       {
+           String err = Application.getMessage(context, UsersDialog.ERROR_PASSWORD_MATCH);
+           throw new ValidatorException(new FacesMessage(err));
+       }
+   }
+
    /**
     * Validate password field data is acceptable
     */
@@ -269,12 +294,13 @@ public class LoginBean implements Serializable
          throws ValidatorException
    {
       int minPasswordLength = Application.getClientConfig(context).getMinPasswordLength();
+      int maxPasswordLength = Application.getClientConfig(context).getMaxPasswordLength();
       
       String pass = (String)value;
-      if (pass.length() < minPasswordLength || pass.length() > 256)
+      if (pass.length() < minPasswordLength || pass.length() > maxPasswordLength)
       {
          String err = MessageFormat.format(Application.getMessage(context, MSG_PASSWORD_LENGTH),
-               new Object[]{minPasswordLength, 256});
+               new Object[]{minPasswordLength, maxPasswordLength});
          throw new ValidatorException(new FacesMessage(err));
       }
    }
diff --git a/source/java/org/alfresco/web/bean/users/CreateUserWizard.java b/source/java/org/alfresco/web/bean/users/CreateUserWizard.java
index cfd30ad20c..60d92370d5 100644
--- a/source/java/org/alfresco/web/bean/users/CreateUserWizard.java
+++ b/source/java/org/alfresco/web/bean/users/CreateUserWizard.java
@@ -270,31 +270,6 @@ public class CreateUserWizard extends BaseWizardBean
         this.sizeQuotaUnits = "";
     }
     
-    @Override
-    public String next()
-    {
-       String stepName = Application.getWizardManager().getCurrentStepName();
-       
-       if ("summary".equals(stepName))
-       {
-           FacesContext context = FacesContext.getCurrentInstance();
-           
-           if (! this.password.equals(this.confirm))
-           {
-               Utils.addErrorMessage(Application.getMessage(context, UsersDialog.ERROR_PASSWORD_MATCH));
-           }
-          
-           checkTenantUserName();
-           
-           if (context.getMessages().hasNext())
-           {
-               Application.getWizardManager().getState().setCurrentStep(Application.getWizardManager().getCurrentStep() - 1);
-           }
-       }
-       
-       return super.next();
-    }
-    
     /**
      * @return Returns the summary data for the wizard.
      */
@@ -594,16 +569,19 @@ public class CreateUserWizard extends BaseWizardBean
 
     /**
      * Validate password field data is acceptable
+     * 
+     * @deprecated Method is never used
      */
     public void validatePassword(FacesContext context, UIComponent component, Object value) throws ValidatorException
     {
         int minPasswordLength = Application.getClientConfig(context).getMinPasswordLength();
+        int maxPasswordLength = Application.getClientConfig(context).getMaxPasswordLength();
         
         String pass = (String)value;
-        if (pass.length() < minPasswordLength || pass.length() > 256)
+        if (pass.length() < minPasswordLength || pass.length() > maxPasswordLength)
         {
             String err = MessageFormat.format(Application.getMessage(context, LoginBean.MSG_PASSWORD_LENGTH),
-                    new Object[]{minPasswordLength, 256});
+                    new Object[]{minPasswordLength, maxPasswordLength});
             throw new ValidatorException(new FacesMessage(err));
         }
     }
@@ -628,6 +606,19 @@ public class CreateUserWizard extends BaseWizardBean
                     new Object[]{"\", \\"});
             throw new ValidatorException(new FacesMessage(err));
         }
+        
+        try
+        {
+            name = PersonServiceImpl.updateUsernameForTenancy(
+                    name, getTenantService()
+            );
+        }
+        catch(TenantDomainMismatchException e)
+        {
+            String err = MessageFormat.format(Application.getMessage(FacesContext.getCurrentInstance(),
+                    ERROR_DOMAIN_MISMATCH), e.getTenantA(), e.getTenantB());
+            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 08e54bc60e..0ede9af8b8 100644
--- a/source/java/org/alfresco/web/config/ClientConfigElement.java
+++ b/source/java/org/alfresco/web/config/ClientConfigElement.java
@@ -75,6 +75,7 @@ public class ClientConfigElement extends ConfigElementAdapter
    private List<QName> simpleSearchAdditionalAttributes = null;
    private int minUsernameLength = 2;
    private int minPasswordLength = 3;
+   private int maxPasswordLength = 255;
    private int minGroupNameLength = 3;
    private String breadcrumbMode = BREADCRUMB_PATH;
    private String cifsURLSuffix = null;
@@ -280,6 +281,11 @@ public class ClientConfigElement extends ConfigElementAdapter
          combinedElement.setMinPasswordLength(newElement.getMinPasswordLength());
       }
 
+      if (newElement.getMaxPasswordLength() != combinedElement.getMaxPasswordLength())
+      {
+         combinedElement.setMaxPasswordLength(newElement.getMaxPasswordLength());
+      }
+
       if (newElement.getMinGroupNameLength() != combinedElement.getMinGroupNameLength())
       {
          combinedElement.setMinGroupNameLength(newElement.getMinGroupNameLength());
@@ -769,6 +775,22 @@ public class ClientConfigElement extends ConfigElementAdapter
       this.minPasswordLength = minPasswordLength;
    }
 
+   /**
+    * @return Returns the maximum length for a password.
+    */
+   public int getMaxPasswordLength()
+   {
+       return this.maxPasswordLength;
+   }
+
+   /**
+    * @param maxPasswordLength The maximum length of a password
+    */
+   public void setMaxPasswordLength(int maxPasswordLength)
+   {
+       this.maxPasswordLength = maxPasswordLength;
+   }
+
    /**
     * @return Returns the minimum length for a group name.
     */
diff --git a/source/java/org/alfresco/web/config/ClientElementReader.java b/source/java/org/alfresco/web/config/ClientElementReader.java
index a1962dfc93..36743b668c 100644
--- a/source/java/org/alfresco/web/config/ClientElementReader.java
+++ b/source/java/org/alfresco/web/config/ClientElementReader.java
@@ -59,6 +59,7 @@ public class ClientElementReader implements ConfigElementReader
    public static final String ELEMENT_SIMPLESEARCHADDITIONALATTRSQNAME = "qname";
    public static final String ELEMENT_MINUSERNAMELENGTH = "username-min-length";
    public static final String ELEMENT_MINPASSWORDLENGTH = "password-min-length";
+   public static final String ELEMENT_MAXPASSWORDLENGTH = "password-max-length";
    public static final String ELEMENT_MINGROUPNAMELENGTH = "group-name-min-length";
    public static final String ELEMENT_BREADCRUMB_MODE = "breadcrumb-mode";
    public static final String ELEMENT_CIFSURLSUFFIX = "cifs-url-suffix";
@@ -268,6 +269,13 @@ public class ClientElementReader implements ConfigElementReader
             configElement.setMinPasswordLength(Integer.parseInt(minPassword.getTextTrim()));
          }
 
+         // get the maximum length of passwords
+         Element maxPassword = element.element(ELEMENT_MAXPASSWORDLENGTH);
+         if (maxPassword != null)
+         {
+            configElement.setMaxPasswordLength(Integer.parseInt(maxPassword.getTextTrim()));
+         }
+
          // get the minimum length of group names
          Element minGroupName = element.element(ELEMENT_MINGROUPNAMELENGTH);
          if (minGroupName != null)
diff --git a/source/web/jsp/users/change-my-password.jsp b/source/web/jsp/users/change-my-password.jsp
index 33bffad8f3..4a0f2b41f6 100644
--- a/source/web/jsp/users/change-my-password.jsp
+++ b/source/web/jsp/users/change-my-password.jsp
@@ -79,15 +79,17 @@
 		<tr>
 			<td></f:verbatim><h:outputText value="#{msg.new_password}" /><f:verbatim>:</td>
 			<td></f:verbatim><h:inputSecret id="password" value="#{UsersBeanProperties.password}"
-				size="35" maxlength="255" validator="#{LoginBean.validatePassword}"
+				size="35" validator="#{LoginBean.validatePassword}"
 				onkeyup="updateButtonState();" onchange="updateButtonState();" /><f:verbatim>&nbsp;*
 				&nbsp;</f:verbatim><h:message id="errors1" for="password" style="color:red" /><f:verbatim></td>
 		</tr>
 		<tr>
 			<td></f:verbatim><h:outputText value="#{msg.confirm}" /><f:verbatim>:</td>
 			<td></f:verbatim><h:inputSecret id="confirm" value="#{UsersBeanProperties.confirm}"
-				size="35" maxlength="255" validator="#{LoginBean.validatePassword}"
-				onkeyup="updateButtonState();" onchange="updateButtonState();" /><f:verbatim>&nbsp;*
+				size="35" validator="#{LoginBean.validateMatch}"
+				onkeyup="updateButtonState();" onchange="updateButtonState();">
+                                	<f:attribute name="passwd1Id" value="dialog:dialog-body:password" />
+                                </h:inputSecret><f:verbatim>&nbsp;*
 				&nbsp;</f:verbatim><h:message id="errors2" for="confirm" style="color:red" /><f:verbatim></td>
 		</tr>
 	</table>
diff --git a/source/web/jsp/users/change-password.jsp b/source/web/jsp/users/change-password.jsp
index f6f84d806e..299a1b5234 100644
--- a/source/web/jsp/users/change-password.jsp
+++ b/source/web/jsp/users/change-password.jsp
@@ -63,7 +63,7 @@
       <td>
          </f:verbatim>
             <h:inputSecret id="password" value="#{UsersBeanProperties.password}"
-                           size="35" maxlength="255" validator="#{LoginBean.validatePassword}"
+                           size="35" validator="#{LoginBean.validatePassword}"
                            onkeyup="updateButtonState();" onchange="updateButtonState();" /><f:verbatim>&nbsp;*
             &nbsp;</f:verbatim><h:message id="errors1" for="password" style="color:red" /><f:verbatim></td>
    </tr>
@@ -72,8 +72,10 @@
       <td>
          </f:verbatim>
             <h:inputSecret id="confirm" value="#{UsersBeanProperties.confirm}"
-                           size="35" maxlength="255" validator="#{LoginBean.validatePassword}"
-                           onkeyup="updateButtonState();" onchange="updateButtonState();" /><f:verbatim>&nbsp;*
+                           size="35" validator="#{LoginBean.validateMatch}"
+                           onkeyup="updateButtonState();" onchange="updateButtonState();" >
+               <f:attribute name="passwd1Id" value="dialog:dialog-body:password" />
+            </h:inputSecret><f:verbatim>&nbsp;*
             &nbsp;</f:verbatim><h:message id="errors2" for="confirm" style="color:red" /><f:verbatim></td>
    </tr>
 </table>
diff --git a/source/web/jsp/users/new-user-wizard/new-user-properties.jsp b/source/web/jsp/users/new-user-wizard/new-user-properties.jsp
index e472593c7a..4718714f75 100644
--- a/source/web/jsp/users/new-user-wizard/new-user-properties.jsp
+++ b/source/web/jsp/users/new-user-wizard/new-user-properties.jsp
@@ -98,17 +98,19 @@ function validate()
 <h:panelGrid columns="4" cellpadding="2" cellspacing="2" width="100%">
    <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
    <h:outputText value="#{msg.username}:"/>
-   <h:inputText id="userName" value="#{WizardManager.bean.userName}" size="35" maxlength="100" validator="#{LoginBean.validateUsername}" onkeyup="updateButtonState();" onchange="updateButtonState();"/>
+   <h:inputText id="userName" value="#{WizardManager.bean.userName}" size="35" maxlength="100" validator="#{WizardManager.bean.validateUsername}" onkeyup="updateButtonState();" onchange="updateButtonState();"/>
    <h:message id="errors1" for="userName" style="color:red" />
    
    <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
    <h:outputText value="#{msg.password}:"/>
-   <h:inputSecret id="password" value="#{WizardManager.bean.password}" size="35" maxlength="100" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" redisplay="true" />
+   <h:inputSecret id="password" value="#{WizardManager.bean.password}" size="35" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" redisplay="true" />
    <h:message id="errors2" for="password" style="color:red" />
    
    <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
    <h:outputText value="#{msg.confirm}:"/>
-   <h:inputSecret id="confirm" value="#{WizardManager.bean.confirm}" size="35" maxlength="100" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" redisplay="true" />
+   <h:inputSecret id="confirm" value="#{WizardManager.bean.confirm}" size="35" validator="#{LoginBean.validateMatch}" onkeyup="updateButtonState();" onchange="updateButtonState();" redisplay="true">
+      <f:attribute name="passwd1Id" value="wizard:wizard-body:password" />
+   </h:inputSecret>
    <h:message id="errors3" for="confirm" style="color:red" />
 </h:panelGrid>