diff --git a/source/java/org/alfresco/web/app/servlet/NTLMAuthenticationFilter.java b/source/java/org/alfresco/web/app/servlet/NTLMAuthenticationFilter.java
index f529c73c10..47d1529d46 100644
--- a/source/java/org/alfresco/web/app/servlet/NTLMAuthenticationFilter.java
+++ b/source/java/org/alfresco/web/app/servlet/NTLMAuthenticationFilter.java
@@ -751,16 +751,13 @@ public class NTLMAuthenticationFilter extends AbstractAuthenticationFilter imple
                 try
                 {
                     tx.begin();
-
-                    // Get user details for the authenticated user
-                    m_authComponent.setCurrentUser(userName.toLowerCase());
-                    
-                    // The user name used may be a different case to the NTLM supplied user name, read the current
-                    // user and use that name
-                    userName = m_authComponent.getCurrentUserName();
                     
                     // Setup User object and Home space ID etc.
                     NodeRef personNodeRef = m_personService.getPerson(userName);
+                    
+                    // User name should match the uid in the person entry found
+                    userName = (String) m_nodeService.getProperty(personNodeRef, ContentModel.PROP_USERNAME);
+                    m_authComponent.setCurrentUser(userName);
                     String currentTicket = m_authService.getCurrentTicket();
                     user = new User(userName, currentTicket, personNodeRef);
                     
diff --git a/source/web/jsp/users/change-my-password.jsp b/source/web/jsp/users/change-my-password.jsp
index dd2a470e92..e3eb107a2a 100644
--- a/source/web/jsp/users/change-my-password.jsp
+++ b/source/web/jsp/users/change-my-password.jsp
@@ -137,21 +137,21 @@
                                  <tr>
                                     <td><h:outputText value="#{msg.old_password}"/>:</td>
                                     <td>
-                                       <h:inputSecret id="old-password" value="#{UsersBean.oldPassword}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" redisplay="true" />&nbsp;*
+                                       <h:inputSecret id="old-password" value="#{UsersBean.oldPassword}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" />&nbsp;*
                                        &nbsp;<h:message id="errors0" for="old-password" style="color:red" />
                                     </td>
                                  </tr>
                                  <tr>
                                     <td><h:outputText value="#{msg.new_password}"/>:</td>
                                     <td>
-                                       <h:inputSecret id="password" value="#{UsersBean.password}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" redisplay="true" />&nbsp;*
+                                       <h:inputSecret id="password" value="#{UsersBean.password}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" />&nbsp;*
                                        &nbsp;<h:message id="errors1" for="password" style="color:red" />
                                     </td>
                                  </tr>
                                  <tr>
                                     <td><h:outputText value="#{msg.confirm}"/>:</td>
                                     <td>
-                                       <h:inputSecret id="confirm" value="#{UsersBean.confirm}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" redisplay="true" />&nbsp;*
+                                       <h:inputSecret id="confirm" value="#{UsersBean.confirm}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" />&nbsp;*
                                        &nbsp;<h:message id="errors2" for="confirm" style="color:red" />
                                     </td>
                                  </tr>
diff --git a/source/web/jsp/users/change-password.jsp b/source/web/jsp/users/change-password.jsp
index a2f5dc6e35..4290148674 100644
--- a/source/web/jsp/users/change-password.jsp
+++ b/source/web/jsp/users/change-password.jsp
@@ -136,14 +136,14 @@
                                  <tr>
                                     <td><h:outputText value="#{msg.password}"/>:</td>
                                     <td>
-                                       <h:inputSecret id="password" value="#{UsersBean.password}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" redisplay="true" />&nbsp;*
+                                       <h:inputSecret id="password" value="#{UsersBean.password}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" />&nbsp;*
                                        &nbsp;<h:message id="errors1" for="password" style="color:red" />
                                     </td>
                                  </tr>
                                  <tr>
                                     <td><h:outputText value="#{msg.confirm}"/>:</td>
                                     <td>
-                                       <h:inputSecret id="confirm" value="#{UsersBean.confirm}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" redisplay="true" />&nbsp;*
+                                       <h:inputSecret id="confirm" value="#{UsersBean.confirm}" size="35" maxlength="1024" validator="#{LoginBean.validatePassword}" onkeyup="updateButtonState();" onchange="updateButtonState();" />&nbsp;*
                                        &nbsp;<h:message id="errors2" for="confirm" style="color:red" />
                                     </td>
                                  </tr>