diff --git a/src/org/labkey/test/tests/UserTest.java b/src/org/labkey/test/tests/UserTest.java
index 4746e35222..30feeda32c 100644
--- a/src/org/labkey/test/tests/UserTest.java
+++ b/src/org/labkey/test/tests/UserTest.java
@@ -80,6 +80,8 @@ public class UserTest extends BaseWebDriverTest
 
     protected final UIUserHelper _userHelper = new UIUserHelper(this);
 
+    private static int _normalUserId;
+
     @Nullable
     @Override
     protected String getProjectName()
@@ -103,7 +105,7 @@ public static void setupProject()
     private void doSetup()
     {
         _containerHelper.createProject(getProjectName(), null);
-        createUserWithPermissions(NORMAL_USER, getProjectName(), "Editor");
+        _normalUserId = createUserWithPermissions(NORMAL_USER, getProjectName(), "Editor").getUserId();
     }
 
     @Override
@@ -263,7 +265,7 @@ public void testSelfServiceEmailSupport()
     public void testCustomFieldLogin()
     {
         String customFieldValue = "loginCredentials";
-        setInitialPassword(NORMAL_USER);
+        setInitialPassword(_normalUserId);
 
         goToSiteUsers();
         DataRegionTable table = new DataRegionTable("Users", getDriver());