diff --git a/config/alfresco/script-services-context.xml b/config/alfresco/script-services-context.xml
index bf2fd92e25..d11981dffc 100644
--- a/config/alfresco/script-services-context.xml
+++ b/config/alfresco/script-services-context.xml
@@ -120,6 +120,12 @@
         <property name="mutableAuthenticationDao">
             <ref bean="authenticationDao"/>
         </property>
+        <property name="userNameGenerator">
+            <ref bean="userNameGenerator"/>
+        </property>
+        <property name="passwordGenerator">
+            <ref bean="passwordGenerator"/>
+        </property>
     </bean>
 
     <bean id="sessionScript" parent="baseJavaScriptExtension" class="org.alfresco.repo.jscript.Session">
diff --git a/source/java/org/alfresco/repo/jscript/People.java b/source/java/org/alfresco/repo/jscript/People.java
index 8ca1fc10f0..3db90d388c 100644
--- a/source/java/org/alfresco/repo/jscript/People.java
+++ b/source/java/org/alfresco/repo/jscript/People.java
@@ -28,6 +28,8 @@ import java.util.Set;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.security.authentication.MutableAuthenticationDao;
+import org.alfresco.repo.security.authentication.PasswordGenerator;
+import org.alfresco.repo.security.authentication.UserNameGenerator;
 import org.alfresco.repo.security.authority.AuthorityDAO;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.repository.NodeRef;
@@ -52,6 +54,8 @@ public final class People extends BaseScopableProcessorExtension
     private AuthorityService authorityService;
     private PersonService personService;
     private MutableAuthenticationDao mutableAuthenticationDao;
+    private UserNameGenerator usernameGenerator;
+    private PasswordGenerator passwordGenerator;
     
     /**
      * Set the mutable authentication dao
@@ -103,6 +107,26 @@ public final class People extends BaseScopableProcessorExtension
         this.personService = personService;
     }
     
+    /**
+     * Set the user name generator service
+     * 
+     * @param userNameGenerator the user name generator 
+     */
+    public void setUserNameGenerator(UserNameGenerator userNameGenerator)
+    {
+        this.usernameGenerator = userNameGenerator;
+    }
+    
+    /**
+     * Set the password generator service
+     * 
+     * @param passwordGenerator the password generator
+     */
+    public void setPasswordGenerator(PasswordGenerator passwordGenerator)
+    {
+        this.passwordGenerator = passwordGenerator;
+    }
+    
     /**
      * Delete a Person with the given username
      * 
@@ -114,33 +138,36 @@ public final class People extends BaseScopableProcessorExtension
     }
     
     /**
-     * Create a Person
+     * Create a Person with a generated user name
      * 
-     * @param createAccount set to 'true' to create an account for the person with a generated user name
-     *      and password
+     * @param createUserAccount set to 'true' to create a user account for the person with the generated user name
+     *                              and password
      * @return the person node (type cm:person) created or null if the person could not be created
      */
-    public ScriptNode createPerson(boolean createAccount)
+    public ScriptNode createPerson(boolean createUserAccount)
     {
-        ParameterCheck.mandatory("createAccount", createAccount);
+        ParameterCheck.mandatory("createUserAccount", createUserAccount);
         
-        // TODO glen.johnson@alfresco.com - create account with generated user name
-        // and password
-        String userName = null;
-        char[] password = null;
-        if (createAccount)
+        ScriptNode person = null;
+        
+        // generate user name
+        String userName = usernameGenerator.generateUserName();
+
+        // create person if user name does not already exist
+        if (!personService.personExists(userName))
         {
-            // TODO glen.johnson@alfresco.com - generate user name that does not already
-            // exist
+            person = createPerson(userName);
             
-            // TODO glen.johnson@alfresco.com - generate password according to some
-            // password generation scheme
-            
-            // TODO glen.johnson@alfresco.com - create user account if user name does not already exist
-            mutableAuthenticationDao.createUser(userName, password);
+            if (createUserAccount)
+            {
+                // generate password
+                char[] password = passwordGenerator.generatePassword().toCharArray();
+                
+                // create account for person with generated userName and password 
+                mutableAuthenticationDao.createUser(userName, password);
+            }
         }
         
-        ScriptNode person = createPerson(userName);
         return person;
     }