diff --git a/source/java/org/alfresco/repo/security/authentication/BasicPasswordGenerator.java b/source/java/org/alfresco/repo/security/authentication/BasicPasswordGenerator.java
index 41c54ef3db..ecc98db0ff 100644
--- a/source/java/org/alfresco/repo/security/authentication/BasicPasswordGenerator.java
+++ b/source/java/org/alfresco/repo/security/authentication/BasicPasswordGenerator.java
@@ -53,6 +53,6 @@ public class BasicPasswordGenerator implements PasswordGenerator
      */
     public String generatePassword()
     {
-        return RandomStringUtils.randomAscii(passwordLength);
+        return RandomStringUtils.randomAlphanumeric(passwordLength);
     }
 }