diff --git a/src/org/labkey/test/tests/UserTest.java b/src/org/labkey/test/tests/UserTest.java
index 30feeda32c..21d8fae9d7 100644
--- a/src/org/labkey/test/tests/UserTest.java
+++ b/src/org/labkey/test/tests/UserTest.java
@@ -274,9 +274,14 @@ public void testCustomFieldLogin()
         log("Adding the custom field to core.Users");
         DomainDesignerPage domainDesignerPage = new DomainDesignerPage(getDriver());
         DomainFormPanel domainFormPanel = domainDesignerPage.fieldsPanel();
-        domainFormPanel.addField("UID")
-                .setType(FieldDefinition.ColumnType.String);
-        domainDesignerPage.clickSave();
+        if (!domainFormPanel.fieldNames().contains("UID"))
+        {
+            domainFormPanel.addField("UID")
+                    .setType(FieldDefinition.ColumnType.String);
+            domainDesignerPage.clickSave();
+        }
+        else
+            domainDesignerPage.clickCancel();
 
         log("Adding value to the custom field");
         navigateToUserDetails(NORMAL_USER);