diff --git a/source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java b/source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java
index d41995bf54..66c9808706 100644
--- a/source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java
+++ b/source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java
@@ -443,7 +443,7 @@ public class RepositoryAuthenticationDao implements MutableAuthenticationDao, In
         properties.remove(ContentModel.PROP_SALT);
         properties.put(ContentModel.PROP_SALT, salt);
         properties.put(ContentModel.PROP_PASSWORD_HASH,  compositePasswordEncoder.encodePreferred(new String(rawPassword), salt));
-        properties.put(ContentModel.PROP_HASH_INDICATOR, compositePasswordEncoder.getPreferredEncoding());
+        properties.put(ContentModel.PROP_HASH_INDICATOR, (Serializable) Arrays.asList(compositePasswordEncoder.getPreferredEncoding()));
         properties.remove(ContentModel.PROP_PASSWORD);
         properties.remove(ContentModel.PROP_PASSWORD_SHA256);
         nodeService.setProperties(userRef, properties);
diff --git a/source/test-java/org/alfresco/repo/security/authentication/AuthenticationTest.java b/source/test-java/org/alfresco/repo/security/authentication/AuthenticationTest.java
index 663ab67846..5b4b0559e0 100644
--- a/source/test-java/org/alfresco/repo/security/authentication/AuthenticationTest.java
+++ b/source/test-java/org/alfresco/repo/security/authentication/AuthenticationTest.java
@@ -521,22 +521,16 @@ public class AuthenticationTest extends TestCase
         assertNotSame(AndyDetails.getPassword(), newDetails.getPassword());
         // assertNotSame(oldSalt, dao.getSalt(newDetails));
 
+        //Update again
+        dao.updateUser("Andy", "potato".toCharArray());
+        newDetails = (UserDetails) dao.loadUserByUsername("Andy");
+        assertNotNull(newDetails);
+        assertEquals("Andy", newDetails.getUsername());
+        assertTrue(compositePasswordEncoder.matches(compositePasswordEncoder.getPreferredEncoding(),"potato", newDetails.getPassword(), null));
+
         dao.deleteUser("Andy");
         assertFalse("Should not be a cache entry for 'Andy'.", authenticationCache.contains("Andy"));
         assertNull("DAO should report that 'Andy' does not exist.", dao.getUserOrNull("Andy"));
-
-        MessageDigest digester;
-        try
-        {
-            digester = MessageDigest.getInstance("MD4");
-            System.out.println("Digester from " + digester.getProvider());
-        }
-        catch (NoSuchAlgorithmException e)
-        {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-            System.out.println("No digester");
-        }
     }
     
     /**