diff --git a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewSelfEditorUser.html b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewSelfEditorUser.html
index 4a92f6fb..855b54f7 100644
--- a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewSelfEditorUser.html
+++ b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewSelfEditorUser.html
@@ -116,7 +116,7 @@
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=Eddie Editor</td>
+	<td>link=Rick Rookie</td>
 	<td></td>
 </tr>
 <tr>
@@ -126,7 +126,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Eddie Editor</td>
+	<td>link=Rick Rookie</td>
 	<td></td>
 </tr>
 <tr>
@@ -171,7 +171,7 @@
 </tr>
 <tr>
 	<td>verifyElementNotPresent</td>
-	<td>link=Eddie Editor</td>
+	<td>link=Rick Rookie</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreateAccountsVB/ConfirmEditedNobodyInfo.html b/utilities/acceptance-tests/suites/CreateAccountsVB/CheckSelfEditorPrivileges.html
similarity index 64%
rename from utilities/acceptance-tests/suites/CreateAccountsVB/ConfirmEditedNobodyInfo.html
rename to utilities/acceptance-tests/suites/CreateAccountsVB/CheckSelfEditorPrivileges.html
index 3a6697d3..38f8c278 100644
--- a/utilities/acceptance-tests/suites/CreateAccountsVB/ConfirmEditedNobodyInfo.html
+++ b/utilities/acceptance-tests/suites/CreateAccountsVB/CheckSelfEditorPrivileges.html
@@ -4,7 +4,7 @@
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link rel="selenium.base" href="" />
-<title>ConfirmEditedNobodyInfo</title>
+<title>CheckNobodyPrivileges</title>
 <style type="text/css">
 .testName {
   color: blue;
@@ -27,7 +27,7 @@
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3" class="testName">ConfirmEditedNobodyInfo</td></tr>
+<tr><td rowspan="1" colspan="3" class="testName">CheckNobodyPrivileges</td></tr>
 </thead><tbody>
 <tr>
 	<td>deleteAllVisibleCookies</td>
@@ -36,7 +36,7 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Confirm Changes to User Information</td>
+	<td class="comment">Check Unprivileged User Rights</td>
 	<td></td>
 </tr>
 <tr>
@@ -61,77 +61,47 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>Log in to VIVO</td>
 	<td></td>
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Try to log in with original username</td>
+	<td class="comment">Login as Richard Rookie</td>
 	<td></td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>username</td>
+	<td>loginName</td>
 	<td>Rick Rookie</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>password</td>
-	<td>resetPasswd</td>
+	<td>loginPassword</td>
+	<td>newPassword</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>loginForm</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>(unknown username)</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Unknown username</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Now log in with new username (and new password)</td>
+	<td class="comment">Check privileges: should not see Data Input, Ontology Editor, Site Configuration, Advanced Data Tools.</td>
 	<td></td>
 </tr>
 <tr>
-	<td>type</td>
-	<td>username</td>
-	<td>Richard Rookie</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>password</td>
-	<td>resetPasswd</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>verifyTextNotPresent</td>
+	<td>Site Admin</td>
 	<td></td>
 </tr>
 <tr>
-	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Logged in as</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Richard Rookie</td>
+	<td>verifyElementNotPresent</td>
+	<td>link=Site Admin</td>
 	<td></td>
 </tr>
 <tr>
@@ -141,7 +111,12 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>link=Home</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Log out</td>
 	<td></td>
 </tr>
 <tr>
@@ -149,7 +124,6 @@
 	<td>VIVO</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/utilities/acceptance-tests/suites/CreateAccountsVB/CreateNewNobodyUser.html b/utilities/acceptance-tests/suites/CreateAccountsVB/CreateNewSelfEditorUser.html
similarity index 95%
rename from utilities/acceptance-tests/suites/CreateAccountsVB/CreateNewNobodyUser.html
rename to utilities/acceptance-tests/suites/CreateAccountsVB/CreateNewSelfEditorUser.html
index c6cc0d4f..33f06d05 100644
--- a/utilities/acceptance-tests/suites/CreateAccountsVB/CreateNewNobodyUser.html
+++ b/utilities/acceptance-tests/suites/CreateAccountsVB/CreateNewSelfEditorUser.html
@@ -61,7 +61,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>Log in to VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -71,22 +71,22 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>username</td>
+	<td>loginName</td>
 	<td>testAdmin</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>password</td>
+	<td>loginPassword</td>
 	<td>Password</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>loginForm</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -94,6 +94,11 @@
 	<td class="comment">Create a new user</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=User accounts</td>
@@ -224,7 +229,6 @@
 	<td>VIVO</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/utilities/acceptance-tests/suites/CreateAccountsVB/EditUserNobodyInfo.html b/utilities/acceptance-tests/suites/CreateAccountsVB/DeleteNewSelfEditorUser.html
similarity index 58%
rename from utilities/acceptance-tests/suites/CreateAccountsVB/EditUserNobodyInfo.html
rename to utilities/acceptance-tests/suites/CreateAccountsVB/DeleteNewSelfEditorUser.html
index d4e80b13..855b54f7 100644
--- a/utilities/acceptance-tests/suites/CreateAccountsVB/EditUserNobodyInfo.html
+++ b/utilities/acceptance-tests/suites/CreateAccountsVB/DeleteNewSelfEditorUser.html
@@ -3,8 +3,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="" />
-<title>EditUserNobodyInfo</title>
+<link rel="selenium.base" href="http://localhost:8080/vivo/" />
+<title>DeleteNewEditorUser</title>
 <style type="text/css">
 .testName {
   color: blue;
@@ -27,7 +27,7 @@
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3" class="testName">EditUserNobodyInfo</td></tr>
+<tr><td rowspan="1" colspan="3" class="testName">DeleteNewEditorUser</td></tr>
 </thead><tbody>
 <tr>
 	<td>deleteAllVisibleCookies</td>
@@ -36,7 +36,7 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Edit User Information</td>
+	<td class="comment">Delete new Editor account</td>
 	<td></td>
 </tr>
 <tr>
@@ -61,7 +61,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>Log in to VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -71,17 +71,32 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>username</td>
+	<td>loginName</td>
 	<td>testAdmin</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>password</td>
+	<td>loginPassword</td>
 	<td>Password</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>loginForm</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">Go to User Accounts</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
 	<td></td>
 </tr>
 <tr>
@@ -89,11 +104,6 @@
 	<td>VIVO Site Administration</td>
 	<td></td>
 </tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Go to user management for our new user account</td>
-	<td></td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=User accounts</td>
@@ -104,6 +114,16 @@
 	<td>User Accounts</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Rick Rookie</td>
+	<td></td>
+</tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">View the new user account, and edit it.</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Rick Rookie</td>
@@ -114,11 +134,6 @@
 	<td>User Account Control Panel</td>
 	<td></td>
 </tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Open the editing form</td>
-	<td></td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>//input[@value='Edit User Account']</td>
@@ -131,112 +146,32 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Change the User Name and the Last Name</td>
+	<td class="comment">Delete the account</td>
 	<td></td>
 </tr>
-<tr>
-	<td>type</td>
-	<td>Username</td>
-	<td>Richard Rookie</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>FirstName</td>
-	<td>Richard</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>primaryAction</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>User Account Control Panel</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Open the Reset Password form</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>//input[@value='Reset Password']</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>User Account Editing Form</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Try two passwords that don't match</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>Md5password</td>
-	<td>otherPassword</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>passwordConfirmation</td>
-	<td>somethingElse</td>
-</tr>
 <tr>
 	<td>click</td>
-	<td>primaryAction</td>
+	<td>_delete</td>
 	<td></td>
 </tr>
 <tr>
-	<td>assertAlert</td>
-	<td>The passwords do not match.</td>
+	<td>assertConfirmation</td>
+	<td>Are you SURE you want to delete this user? If in doubt, CANCEL.</td>
 	<td></td>
 </tr>
 <tr>
-	<td>comment</td>
-	<td class="comment">Try passwords that match, but are too long</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>passwordConfirmation</td>
-	<td>otherPassword</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>primaryAction</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertAlert</td>
-	<td>Please enter a password between 6 and 12 characters long.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Try a good password, with a good match.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>Md5password</td>
-	<td>resetPasswd</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>passwordConfirmation</td>
-	<td>resetPasswd</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>primaryAction</td>
+	<td>waitForPageToLoad</td>
+	<td>5000</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>User Account Control Panel</td>
+	<td>User Accounts</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>link=Rick Rookie</td>
 	<td></td>
 </tr>
 <tr>
@@ -244,6 +179,11 @@
 	<td class="comment">Logout</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Home</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Log out</td>
@@ -254,7 +194,6 @@
 	<td>VIVO</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/utilities/acceptance-tests/suites/CreateAccountsVB/FirstTimeNobodyLogin.html b/utilities/acceptance-tests/suites/CreateAccountsVB/FirstTimeSelfEditorLogin.html
similarity index 58%
rename from utilities/acceptance-tests/suites/CreateAccountsVB/FirstTimeNobodyLogin.html
rename to utilities/acceptance-tests/suites/CreateAccountsVB/FirstTimeSelfEditorLogin.html
index 7934b201..ecd9cf1e 100644
--- a/utilities/acceptance-tests/suites/CreateAccountsVB/FirstTimeNobodyLogin.html
+++ b/utilities/acceptance-tests/suites/CreateAccountsVB/FirstTimeSelfEditorLogin.html
@@ -4,7 +4,7 @@
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link rel="selenium.base" href="" />
-<title>FirstTimeNobodyLogin</title>
+<title>FirstTimeCuratorLogin</title>
 <style type="text/css">
 .testName {
   color: blue;
@@ -27,7 +27,7 @@
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3" class="testName">FirstTimeNobodyLogin</td></tr>
+<tr><td rowspan="1" colspan="3" class="testName">FirstTimeCuratorLogin</td></tr>
 </thead><tbody>
 <tr>
 	<td>deleteAllVisibleCookies</td>
@@ -36,7 +36,7 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">First-time login for new unprivileged users</td>
+	<td class="comment">Check first time login process</td>
 	<td></td>
 </tr>
 <tr>
@@ -51,7 +51,7 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Login for the first time</td>
+	<td class="comment">Must not be logged in already</td>
 	<td></td>
 </tr>
 <tr>
@@ -61,197 +61,212 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>Log in to VIVO</td>
 	<td></td>
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Try the wrong password</td>
+	<td class="comment">Try logging in with wrong password</td>
 	<td></td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>username</td>
+	<td>loginName</td>
 	<td>Rick Rookie</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>password</td>
+	<td>loginPassword</td>
 	<td>incorrect</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>loginForm</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>Log in to VIVO</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>(1st login; initial password entered incorrectly)</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Please try entering provided password again</td>
+	<td>The email or password you entered is incorrect.</td>
 	<td></td>
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Now the correct password</td>
+	<td class="comment">Login with correct password</td>
 	<td></td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>password</td>
+	<td>loginName</td>
+	<td>Rick Rookie</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>loginPassword</td>
 	<td>myPassword</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>loginForm</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>(1st login; changing to new private password)</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Please now choose a private password</td>
+	<td>Log in to VIVO</td>
 	<td></td>
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Try changing to an invalid password</td>
+	<td class="comment">Now it's time to change the password</td>
 	<td></td>
 </tr>
 <tr>
-	<td>type</td>
-	<td>password</td>
-	<td>junk</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>loginSubmitMode</td>
+	<td>verifyTextPresent</td>
+	<td>New Password</td>
 	<td></td>
 </tr>
 <tr>
-	<td>assertAlert</td>
-	<td>Please enter a password between 6 and 12 characters long</td>
+	<td>verifyTextPresent</td>
+	<td>Confirm Password</td>
 	<td></td>
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Now try a valid one</td>
+	<td class="comment">Try an invalid password</td>
 	<td></td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>password</td>
+	<td>newPassword</td>
+	<td>junky</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>confirmPassword</td>
+	<td>junky</td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>passwordChangeForm</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Please enter a password between 6 and 12 characters in length.</td>
+	<td></td>
+</tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">Try using the original password as the new one</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>newPassword</td>
+	<td>myPassword</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>confirmPassword</td>
+	<td>myPassword</td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>passwordChangeForm</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Log in to VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Please choose a different password from the temporary one provided initially.</td>
+	<td></td>
+</tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">Try using 2 different passwords</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>newPassword</td>
+	<td>newPassword</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>confirmPassword</td>
+	<td>newPasword</td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>passwordChangeForm</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>The passwords entered do not match.</td>
+	<td></td>
+</tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">Change password correctly</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>newPassword</td>
+	<td>newPassword</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>confirmPassword</td>
 	<td>newPassword</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>(changing to new password)</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Please re-enter new private password</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Re-enter it incorrectly</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>password</td>
-	<td>garbage</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>(password incorrect)</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Incorrect password: try again</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Now re-enter it correctly</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>password</td>
-	<td>newPassword</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Are we logged in?</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Logged in as</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Rick Rookie</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Logout</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>passwordChangeForm</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">Verify that account is logged in</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Rick Rookie</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>You have logged in, but the system contains no profile for you. </td>
+	<td></td>
+</tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">Log out</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Home</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Log out</td>
 	<td></td>
 </tr>
 <tr>
@@ -259,7 +274,6 @@
 	<td>VIVO</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/utilities/acceptance-tests/suites/CreateAccountsVB/Suite.html b/utilities/acceptance-tests/suites/CreateAccountsVB/Suite.html
index d0a82b14..537dff58 100644
--- a/utilities/acceptance-tests/suites/CreateAccountsVB/Suite.html
+++ b/utilities/acceptance-tests/suites/CreateAccountsVB/Suite.html
@@ -1,22 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>Test Suite</title>
-</head>
-<body>
-<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>Test Suite</b></td></tr>
-<tr><td><a href="SetDefaultTheme.html">SetDefaultTheme</a></td></tr>
-<tr><td><a href="CreateNewCuratorUser.html">CreateNewCuratorUser</a></td></tr>
-<tr><td><a href="FirstTimeCuratorLogin.html">FirstTimeCuratorLogin</a></td></tr>
-<tr><td><a href="CheckCuratorPrivileges.html">CheckCuratorPrivileges</a></td></tr>
-<tr><td><a href="CreateNewEditorUser.html">CreateNewEditorUser</a></td></tr>
-<tr><td><a href="FirstTimeEditorLogin.html">FirstTimeEditorLogin</a></td></tr>
-<tr><td><a href="CheckEditorPrivileges.html">CheckEditorPrivileges</a></td></tr>
-<tr><td><a href="DeleteNewCuratorUser.html">DeleteNewCuratorUser</a></td></tr>
-<tr><td><a href="DeleteNewEditorUser.html">DeleteNewEditorUser</a></td></tr>
-</tbody></table>
-</body>
-</html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
+  <title>Test Suite</title>
+</head>
+<body>
+<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
+<tr><td><b>Test Suite</b></td></tr>
+<tr><td><a href="SetDefaultTheme.html">SetDefaultTheme</a></td></tr>
+<tr><td><a href="CreateNewSelfEditorUser.html">CreateNewSelfEditorUser</a></td></tr>
+<tr><td><a href="FirstTimeSelfEditorLogin.html">FirstTimeSelfEditorLogin</a></td></tr>
+<tr><td><a href="TryNewSelfEditorPassword.html">TryNewSelfEditorPassword</a></td></tr>
+<tr><td><a href="CheckSelfEditorPrivileges.html">CheckSelfEditorPrivileges</a></td></tr>
+<tr><td><a href="CreateNewCuratorUser.html">CreateNewCuratorUser</a></td></tr>
+<tr><td><a href="FirstTimeCuratorLogin.html">FirstTimeCuratorLogin</a></td></tr>
+<tr><td><a href="CheckCuratorPrivileges.html">CheckCuratorPrivileges</a></td></tr>
+<tr><td><a href="CheckCuratorLoginLogout.html">CheckCuratorLoginLogout</a></td></tr>
+<tr><td><a href="CreateNewEditorUser.html">CreateNewEditorUser</a></td></tr>
+<tr><td><a href="FirstTimeEditorLogin.html">FirstTimeEditorLogin</a></td></tr>
+<tr><td><a href="CheckEditorPrivileges.html">CheckEditorPrivileges</a></td></tr>
+<tr><td><a href="CheckEditorLoginLogout.html">CheckEditorLoginLogout</a></td></tr>
+<tr><td><a href="DeleteNewSelfEditorUser.html">DeleteNewSelfEditorUser</a></td></tr>
+<tr><td><a href="DeleteNewCuratorUser.html">DeleteNewCuratorUser</a></td></tr>
+<tr><td><a href="DeleteNewEditorUser.html">DeleteNewEditorUser</a></td></tr>
+</tbody></table>
+</body>
+</html>
diff --git a/utilities/acceptance-tests/suites/CreateAccountsVB/Suite_HoldForSelfEditor.html b/utilities/acceptance-tests/suites/CreateAccountsVB/Suite_HoldForSelfEditor.html
deleted file mode 100644
index 4dbb615e..00000000
--- a/utilities/acceptance-tests/suites/CreateAccountsVB/Suite_HoldForSelfEditor.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>Test Suite</title>
-</head>
-<body>
-<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>Test Suite</b></td></tr>
-<tr><td><a href="CreateNewNobodyUser.html">CreateNewNobodyUser</a></td></tr>
-<tr><td><a href="FirstTimeNobodyLogin.html">FirstTimeNobodyLogin</a></td></tr>
-<tr><td><a href="TryNewNobodyPassword.html">TryNewNobodyPassword</a></td></tr>
-<tr><td><a href="EditUserNobodyInfo.html">EditUserNobodyInfo</a></td></tr>
-<tr><td><a href="ConfirmEditedNobodyInfo.html">ConfirmEditedNobodyInfo</a></td></tr>
-<tr><td><a href="CheckNobodyPrivileges.html">CheckNobodyPrivileges</a></td></tr>
-<tr><td><a href="CreateNewCuratorUser.html">CreateNewCuratorUser</a></td></tr>
-<tr><td><a href="FirstTimeCuratorLogin.html">FirstTimeCuratorLogin</a></td></tr>
-<tr><td><a href="CheckCuratorPrivileges.html">CheckCuratorPrivileges</a></td></tr>
-<tr><td><a href="CreateNewEditorUser.html">CreateNewEditorUser</a></td></tr>
-<tr><td><a href="FirstTimeEditorLogin.html">FirstTimeEditorLogin</a></td></tr>
-<tr><td><a href="CheckEditorPrivileges.html">CheckEditorPrivileges</a></td></tr>
-<tr><td><a href="DeleteNewNobodyUser.html">DeleteNewNobodyUser</a></td></tr>
-<tr><td><a href="DeleteNewCuratorUser.html">DeleteNewCuratorUser</a></td></tr>
-<tr><td><a href="DeleteNewEditorUser.html">DeleteNewEditorUser</a></td></tr>
-</tbody></table>
-</body>
-</html>
diff --git a/utilities/acceptance-tests/suites/CreateAccountsVB/TryNewNobodyPassword.html b/utilities/acceptance-tests/suites/CreateAccountsVB/TryNewSelfEditorPassword.html
similarity index 86%
rename from utilities/acceptance-tests/suites/CreateAccountsVB/TryNewNobodyPassword.html
rename to utilities/acceptance-tests/suites/CreateAccountsVB/TryNewSelfEditorPassword.html
index 8fe3a2e7..2d2b1993 100644
--- a/utilities/acceptance-tests/suites/CreateAccountsVB/TryNewNobodyPassword.html
+++ b/utilities/acceptance-tests/suites/CreateAccountsVB/TryNewSelfEditorPassword.html
@@ -61,22 +61,22 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>username</td>
+	<td>loginName</td>
 	<td>Rick Rookie</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>password</td>
+	<td>loginPassword</td>
 	<td>newPassword</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>loginForm</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -86,12 +86,17 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Logged in as</td>
+	<td>Rick Rookie</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Rick Rookie</td>
+	<td>Log out</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>You have logged in, but the system contains no profile for you. </td>
 	<td></td>
 </tr>
 <tr>
@@ -101,7 +106,12 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>link=Home</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Log out</td>
 	<td></td>
 </tr>
 <tr>
@@ -109,7 +119,6 @@
 	<td>VIVO</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/utilities/acceptance-tests/suites/CreatePeople/Suite_WITH_AUTOLINK.html b/utilities/acceptance-tests/suites/CreatePeople/Suite_WITH_AUTOLINK.html
new file mode 100644
index 00000000..c16c57de
--- /dev/null
+++ b/utilities/acceptance-tests/suites/CreatePeople/Suite_WITH_AUTOLINK.html
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
+  <title>Test Suite</title>
+</head>
+<body>
+<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
+<tr><td><b>Test Suite</b></td></tr>
+<tr><td><a href="SetDefaultTheme.html">SetDefaultTheme</a></td></tr>
+<tr><td><a href="CreateFacultyMember.html">CreateFacultyMember</a></td></tr>
+<tr><td><a href="CreateLibrarian.html">CreateLibrarian</a></td></tr>
+<tr><td><a href="AddFacultyInfo.html">AddFacultyInfo</a></td></tr>
+<tr><td><a href="EditFacultyInfo.html">EditFacultyInfo</a></td></tr>
+<tr><td><a href="AddFacultyInfo2.html">AddFacultyInfo2</a></td></tr>
+<tr><td><a href="PublicFacultyInfo.html">PublicFacultyInfo</a></td></tr>
+<tr><td><a href="SearchFacultyInfo.html">SearchFacultyInfo</a></td></tr>
+<tr><td><a href="DeleteFacultyInfo.html">DeleteFacultyInfo</a></td></tr>
+<tr><td><a href="UploadFacultyImage.html">UploadFacultyImage</a></td></tr>
+<tr><td><a href="ChangeFacultyImage.html">ChangeFacultyImage</a></td></tr>
+<tr><td><a href="VerifyImageDisplay.html">VerifyImageDisplay</a></td></tr>
+<tr><td><a href="UploadLibrarianImage.html">UploadLibrarianImage</a></td></tr>
+<tr><td><a href="ChangeLibrarianImage.html">ChangeLibrarianImage</a></td></tr>
+<tr><td><a href="SetupTestTabs.html">SetupTestTabs</a></td></tr>
+<tr><td><a href="AddFacultyClassAutolink.html">AddFacultyClassAutolink</a></td></tr>
+<tr><td><a href="AddLibrarianClassAutolink.html">AddLibrarianClassAutolink</a></td></tr>
+<tr><td><a href="AddFacultyPosition.html">AddFacultyPosition</a></td></tr>
+<tr><td><a href="AssociateLibToFac.html">AssociateLibToFac</a></td></tr>
+<tr><td><a href="CheckPeopleLinks.html">CheckPeopleLinks</a></td></tr>
+<tr><td><a href="SearchPeople.html">SearchPeople</a></td></tr>
+<tr><td><a href="BrowseIndex.html">BrowseIndex</a></td></tr>
+<tr><td><a href="DeleteFacultyImage.html">DeleteFacultyImage</a></td></tr>
+<tr><td><a href="DeleteLibrarianImage.html">DeleteLibrarianImage</a></td></tr>
+<tr><td><a href="DeleteTestPeople.html">DeleteTestPeople</a></td></tr>
+<tr><td><a href="DeleteTestTabs.html">DeleteTestTabs</a></td></tr>
+<tr><td><a href="DeleteLibtoFacAssociation.html">DeleteLibtoFacAssociation</a></td></tr>
+<tr><td><a href="DeleteTestOrganization.html">DeleteTestOrganization</a></td></tr>
+<tr><td><a href="DeleteEverythingElse.html">DeleteEverythingElse</a></td></tr>
+<tr><td><a href="UploadNonPersonImage.html">UploadNonPersonImage</a></td></tr>
+</tbody></table>
+</body>
+</html>
diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/Suite_WITH_AUTOLINK.html b/utilities/acceptance-tests/suites/CreatePeopleVB/Suite_WITH_AUTOLINK.html
new file mode 100644
index 00000000..9d13086f
--- /dev/null
+++ b/utilities/acceptance-tests/suites/CreatePeopleVB/Suite_WITH_AUTOLINK.html
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
+  <title>Test Suite</title>
+</head>
+<body>
+<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
+<tr><td><b>Test Suite</b></td></tr>
+<tr><td><a href="SetDefaultTheme.html">SetDefaultTheme</a></td></tr>
+<tr><td><a href="CreateFacultyMember.html">CreateFacultyMember</a></td></tr>
+<tr><td><a href="CreateLibrarian.html">CreateLibrarian</a></td></tr>
+<tr><td><a href="AddFacultyInfo.html">AddFacultyInfo</a></td></tr>
+<tr><td><a href="EditFacultyInfo.html">EditFacultyInfo</a></td></tr>
+<tr><td><a href="AddFacultyInfo2.html">AddFacultyInfo2</a></td></tr>
+<tr><td><a href="PublicFacultyInfo.html">PublicFacultyInfo</a></td></tr>
+<tr><td><a href="SearchFacultyInfo.html">SearchFacultyInfo</a></td></tr>
+<tr><td><a href="DeleteFacultyInfo.html">DeleteFacultyInfo</a></td></tr>
+<tr><td><a href="UploadFacultyImage.html">UploadFacultyImage</a></td></tr>
+<tr><td><a href="ChangeFacultyImage.html">ChangeFacultyImage</a></td></tr>
+<tr><td><a href="VerifyImageDisplay.html">VerifyImageDisplay</a></td></tr>
+<tr><td><a href="UploadLibrarianImage.html">UploadLibrarianImage</a></td></tr>
+<tr><td><a href="ChangeLibrarianImage.html">ChangeLibrarianImage</a></td></tr>
+<tr><td><a href="SetupTestTabs.html">SetupTestTabs</a></td></tr>
+<tr><td><a href="AddFacultyClassAutolink.html">AddFacultyClassAutolink</a></td></tr>
+<tr><td><a href="AddLibrarianClassAutolink.html">AddLibrarianClassAutolink</a></td></tr>
+<tr><td><a href="AddFacultyPosition.html">AddFacultyPosition</a></td></tr>
+<tr><td><a href="AssociateLibToFac.html">AssociateLibToFac</a></td></tr>
+<tr><td><a href="CheckPeopleLinks.html">CheckPeopleLinks</a></td></tr>
+<tr><td><a href="SearchPeople.html">SearchPeople</a></td></tr>
+<tr><td><a href="BrowseIndex.html">BrowseIndex</a></td></tr>
+<tr><td><a href="DeleteFacultyImage.html">DeleteFacultyImage</a></td></tr>
+<tr><td><a href="DeleteLibrarianImage.html">DeleteLibrarianImage</a></td></tr>
+<tr><td><a href="DeleteTestPeople.html">DeleteTestPeople</a></td></tr>
+<tr><td><a href="DeleteTestTabs.html">DeleteTestTabs</a></td></tr>
+<tr><td><a href="DeleteLibtoFacAssociation.html">DeleteLibtoFacAssociation</a></td></tr>
+<tr><td><a href="DeleteTestOrganization.html">DeleteTestOrganization</a></td></tr>
+<tr><td><a href="DeleteEverythingElse.html">DeleteEverythingElse</a></td></tr>
+<tr><td><a href="UploadNonPersonImage.html">UploadNonPersonImage</a></td></tr>
+</tbody></table>
+</body>
+</html>
