diff --git a/cypress/e2e/ui/admin/admin.user.password.spec.js b/cypress/e2e/ui/admin/admin.user.password.spec.js
deleted file mode 100644
index 1a74dedae3..0000000000
--- a/cypress/e2e/ui/admin/admin.user.password.spec.js
+++ /dev/null
@@ -1,16 +0,0 @@
-context("Admin User Password", () => {
-    it("List System Users", () => {
-        cy.loginAdmin("UserList.php");
-        cy.contains("Church Admin");
-    });
-
-    it("Admin Change password", () => {
-        cy.loginAdmin("v2/user/95/changePassword");
-        cy.contains("Change Password: Judith Kennedy");
-        cy.get("#NewPassword1").type("new-user-password");
-        cy.get("#NewPassword2").type("new-user-password");
-        cy.get("form:nth-child(2)").submit();
-        cy.url().should("contains", "v2/user/95/changePassword");
-        cy.contains("Password Change Successful");
-    });
-});
diff --git a/cypress/e2e/ui/admin/admin.user.spec.js b/cypress/e2e/ui/admin/admin.user.spec.js
new file mode 100644
index 0000000000..c3053520f1
--- /dev/null
+++ b/cypress/e2e/ui/admin/admin.user.spec.js
@@ -0,0 +1,33 @@
+context("Admin User Password", () => {
+    it("List System Users", () => {
+        cy.loginAdmin("UserList.php");
+        cy.contains("Church Admin");
+    });
+
+    it("Admin Change password", () => {
+        cy.loginAdmin("v2/user/95/changePassword");
+        cy.contains("Change Password: Judith Kennedy");
+        cy.get("#NewPassword1").type("new-user-password");
+        cy.get("#NewPassword2").type("new-user-password");
+        cy.get("form:nth-child(2)").submit();
+        cy.url().should("contains", "v2/user/95/changePassword");
+        cy.contains("Password Change Successful");
+    });
+
+
+    it("Create System Users", () => {
+        cy.loginAdmin("UserList.php");
+        cy.contains("Peyton Ray").should('not.exist');
+        cy.visit("PersonView.php?PersonID=25");
+        cy.contains("Peyton Ray");
+        cy.contains("Edit User").should('not.exist');
+        cy.contains("Make User");
+        cy.visit('UserEditor.php?NewPersonID=25');
+        cy.contains("User Editor");
+        cy.get('.TextColumnWithBottomBorder > select').type('skin-yellow');
+        cy.get('tr:nth-child(14) .btn-primary').click();
+        cy.url().should('contains', 'UserList.php');
+        cy.contains("Peyton Ray");
+
+    });
+});
diff --git a/src/ChurchCRM/Emails/BaseEmail.php b/src/ChurchCRM/Emails/BaseEmail.php
index c5ee0aa7e5..6da5f6621f 100644
--- a/src/ChurchCRM/Emails/BaseEmail.php
+++ b/src/ChurchCRM/Emails/BaseEmail.php
@@ -26,7 +26,7 @@ public function __construct(array $toAddresses)
             $this->mail->addAddress($email);
         }
 
-        $loader = new FilesystemLoader('../templates/email');
+        $loader = new FilesystemLoader(__DIR__ . '/../../templates/email');
         $this->twig = new Environment($loader);
     }