diff --git a/test/phpunit-bootstrap.php b/test/phpunit-bootstrap.php
index 7ed2d272..1b95c51c 100644
--- a/test/phpunit-bootstrap.php
+++ b/test/phpunit-bootstrap.php
@@ -159,7 +159,7 @@ function getUserIsPIHasAtLeastOneMember()
 
 function getNonExistentUser()
 {
-    return ["user1@nonexistent.test", "foo", "bar", "user1@nonexistent.test"];
+    return ["user2000@org2.test", "foo", "bar", "user2000@org2.test"];
 }
 
 function getAdminUser()
diff --git a/webroot/panel/new_account.php b/webroot/panel/new_account.php
index 3784990c..13530469 100644
--- a/webroot/panel/new_account.php
+++ b/webroot/panel/new_account.php
@@ -94,12 +94,6 @@
         <hr>
 
         <label><input type='radio' name='new_user_sel' value='pi'>Request a PI account</label>
-        <div style='position: relative;display: none;' id='piConfirmWrapper'>
-        <label><input type='checkbox' id='chk_pi' name='confirm_pi' value='agree'>
-           I have read the PI <a href="<?php echo $CONFIG["site"]["account_policy_url"]; ?>">
-            account policy</a> guidelines. </label>
-        </div>
-        <br>
         <label><input type='radio' name='new_user_sel' value='not_pi' checked>Join an existing PI group</label>
 
         <div style='position: relative;' id='piSearchWrapper'>
@@ -109,9 +103,16 @@
 
         <hr>
 
+        <div style='position: relative;display: none;' id='piConfirmWrapper'>
+        <label><input type='checkbox' id='chk_pi' name='confirm_pi' value='agree'>
+           I have read the PI <a href="<?php echo $CONFIG["site"]["account_policy_url"]; ?>">
+            account policy</a> guidelines. </label>
+        </div>
+        <br>
+
         <label><input type='checkbox' id='chk_eula' name='eula' value='agree' required>
             I have read and accept the <a target='_blank' href='<?php echo $CONFIG["site"]["terms_of_service_url"]; ?>'>
-                Unity Terms of Service</a></label>
+                Unity Terms of Service</a>.</label>
 
         <br>
         <input style='margin-top: 10px;' type='submit' value='Request Account'>