diff --git a/ehr/resources/views/ehrTemplates.html b/ehr/resources/views/ehrTemplates.html
index 85e8be151..8bc92b752 100644
--- a/ehr/resources/views/ehrTemplates.html
+++ b/ehr/resources/views/ehrTemplates.html
@@ -37,14 +37,18 @@
     }
 
     createEHRBillingDomainHandler = function () {
-        var ctx = EHR.Utils.getEHRContext();
+        const ctx = EHR.Utils.getEHRContext();
+        const container = document.getElementById("ehrbilling_container").value;
+        if (!container) {
+            LABKEY.Utils.alert("Error", "Must enter the container path of the billing folder.");
+        }
 
         LABKEY.Domain.create({
             module: ctx ? ctx['EHRCustomModule'] : null,
             domainKind: "EHR_Billing",
             domainGroup: "ehr_billing",
             importData: false,
-            containerPath: ctx ? ctx['EHRStudyContainer'] : null,
+            containerPath: container,
             success: function () {
                 LABKEY.Utils.alert("Success","EHR_Billing tables updated successfully.");
             },
@@ -55,8 +59,8 @@
     }
 
     createEHRComplianceDomainHandler = function () {
-        var ctx = EHR.Utils.getEHRContext();
-        var container = document.getElementById("ehrcompliance_container").value;
+        const ctx = EHR.Utils.getEHRContext();
+        const container = document.getElementById("ehrcompliance_container").value;
         if (!container) {
             LABKEY.Utils.alert("Error", "Must enter the container path of the compliance folder.");
         }
@@ -90,16 +94,19 @@
     <h5><b>
         <a style="cursor: pointer;" id='createEHRDomainHandler'>Load EHR table definitions</a>
         <br><br>
+
         <a style="cursor: pointer;" id='createEHRLookupsDomainHandler'>Load EHR_Lookup table definitions</a>
         <br><br>
-        <a style="cursor: pointer;" id='createEHRBillingDomainHandler'>Load EHR_Billing table definitions</a>
+
+        <a style="margin-right: 10px; cursor: pointer;" id='createEHRBillingDomainHandler'>Load EHR_Billing table definitions</a>
+        <label for="ehrbilling_container">Container:</label>
+        <input type="text" id="ehrbilling_container" name="ehrbilling_container" style="width: 300px;">
         <br><br>
-        <div>
-            <a style="margin-right: 10px; cursor: pointer;" id='createEHRComplianceDomainHandler'>Load EHR_Compliance table definitions</a>
-            <label for="ehrcompliance_container">Container:</label>
-            <input type="text" id="ehrcompliance_container" name="ehrcompliance_container" style="width: 300px;">
 
-        </div>
+        <a style="margin-right: 10px; cursor: pointer;" id='createEHRComplianceDomainHandler'>Load EHR_Compliance table definitions</a>
+        <label for="ehrcompliance_container">Container:</label>
+        <input type="text" id="ehrcompliance_container" name="ehrcompliance_container" style="width: 300px;">
+
     </b></h5>
 </div>
 </html>
\ No newline at end of file
diff --git a/ehr/test/src/org/labkey/test/util/ehr/EHRTestHelper.java b/ehr/test/src/org/labkey/test/util/ehr/EHRTestHelper.java
index fcf79a5ef..32ec32e8c 100644
--- a/ehr/test/src/org/labkey/test/util/ehr/EHRTestHelper.java
+++ b/ehr/test/src/org/labkey/test/util/ehr/EHRTestHelper.java
@@ -290,6 +290,14 @@ public void verifyAllReportTabs(ParticipantViewPage participantView)
         verifyReportTabs(participantView, Collections.emptyMap());
     }
 
+    public WebElement fillAnInputByName(String name, String value)
+    {
+        WebElement el = Locator.name(name).findElement(_test.getDriver());
+        el.click();
+        el.sendKeys(value);
+        return el;
+    }
+
     /**
      * Verify that the specified reports have no errors
      * @param participantView Should be on a participant view or animal history page with some animals selected