diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/igCoreAPI/RMUserAPI.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/igCoreAPI/RMUserAPI.java
index 5eb0a648bd..50c114fb81 100644
--- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/igCoreAPI/RMUserAPI.java
+++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/igCoreAPI/RMUserAPI.java
@@ -42,7 +42,6 @@ import org.alfresco.dataprep.AlfrescoHttpClient;
 import org.alfresco.dataprep.AlfrescoHttpClientFactory;
 import org.alfresco.rest.core.RMRestProperties;
 import org.alfresco.rest.core.RMRestWrapper;
-import org.alfresco.rest.rm.community.base.TestData;
 import org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponent;
 import org.alfresco.rest.rm.community.model.user.UserPermissions;
 import org.alfresco.rest.rm.community.requests.RMModelRequest;
@@ -156,9 +155,11 @@ public class RMUserAPI extends RMModelRequest
      * Creates a user with the given name using the old APIs
      *
      * @param userName The user name
+     * @param userPassword The user's password
+     * @param userEmail The user's e-mail address
      * @return <code>true</code> if the user was created successfully, <code>false</code> otherwise.
      */
-    public boolean createUser(String userName)
+    public boolean createUser(String userName, String userPassword, String userEmail)
     {
         AlfrescoHttpClient client = getAlfrescoHttpClient();
         
@@ -166,8 +167,8 @@ public class RMUserAPI extends RMModelRequest
             .add("userName", userName)
             .add("firstName", userName)
             .add("lastName", userName)
-            .add("password", TestData.DEFAULT_PASSWORD)
-            .add("email", TestData.DEFAULT_EMAIL)
+            .add("password", userPassword)
+            .add("email", userEmail)
             .getJson();
         
         RequestSpecification spec = new RequestSpecBuilder()
diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/site/RMSiteTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/site/RMSiteTests.java
index b1c4179577..5cc5dffb32 100644
--- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/site/RMSiteTests.java
+++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/site/RMSiteTests.java
@@ -49,6 +49,7 @@ import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 
 import org.alfresco.rest.rm.community.base.BaseRMRestTest;
+import org.alfresco.rest.rm.community.base.TestData;
 import org.alfresco.rest.rm.community.model.site.RMSite;
 import org.alfresco.rest.rm.community.requests.igCoreAPI.RMSiteAPI;
 import org.alfresco.utility.data.RandomData;
@@ -203,7 +204,7 @@ public class RMSiteTests extends BaseRMRestTest
         }
 
         // Create user
-        getRestAPIFactory().getRMUserAPI().createUser(ANOTHER_ADMIN);
+        getRestAPIFactory().getRMUserAPI().createUser(ANOTHER_ADMIN, TestData.DEFAULT_PASSWORD, TestData.DEFAULT_EMAIL);
 
         // Create the RM site
         RMSite rmSiteModel = getRestAPIFactory().getRMSiteAPI(new UserModel(ANOTHER_ADMIN, DEFAULT_PASSWORD)).createRMSite(createDOD5015RMSiteModel());