diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CheckNobodyPrivileges.html b/utilities/acceptance-tests/suites/CreateAccounts/CheckSelfEditorPrivileges.html
similarity index 80%
rename from utilities/acceptance-tests/suites/CreateAccounts/CheckNobodyPrivileges.html
rename to utilities/acceptance-tests/suites/CreateAccounts/CheckSelfEditorPrivileges.html
index 6ca0a90c..38f8c278 100644
--- a/utilities/acceptance-tests/suites/CreateAccounts/CheckNobodyPrivileges.html
+++ b/utilities/acceptance-tests/suites/CreateAccounts/CheckSelfEditorPrivileges.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>Richard Rookie</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>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -96,22 +96,12 @@
 </tr>
 <tr>
 	<td>verifyTextNotPresent</td>
-	<td>Data Input</td>
+	<td>Site Admin</td>
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextNotPresent</td>
-	<td>Ontology Editor</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextNotPresent</td>
-	<td>Site Configuration</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextNotPresent</td>
-	<td>Advanced Data Tools</td>
+	<td>verifyElementNotPresent</td>
+	<td>link=Site Admin</td>
 	<td></td>
 </tr>
 <tr>
@@ -120,13 +110,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>clickAndWait</td>
+	<td>link=Home</td>
 	<td></td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>link=Log out</td>
 	<td></td>
 </tr>
 <tr>
@@ -134,7 +124,6 @@
 	<td>VIVO</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/ConfirmEditedNobodyInfo.html b/utilities/acceptance-tests/suites/CreateAccounts/ConfirmEditedNobodyInfo.html
deleted file mode 100644
index 3a6697d3..00000000
--- a/utilities/acceptance-tests/suites/CreateAccounts/ConfirmEditedNobodyInfo.html
+++ /dev/null
@@ -1,155 +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 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>
-<style type="text/css">
-.testName {
-  color: blue;
-  background: rgb(80%, 80%, 80%);
-  font-family: sans-serif;
-  font-weight: bold;
-  font-size: larger;
-  text-align: center;
-}
-.comment {
-  color: blue;
-  background: rgb(80%, 80%, 80%);
-  font-family: sans-serif;
-  font-weight: bold;
-  font-size: larger;
-  text-align: center;
-}
-</style>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3" class="testName">ConfirmEditedNobodyInfo</td></tr>
-</thead><tbody>
-<tr>
-	<td>deleteAllVisibleCookies</td>
-	<td></td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Confirm Changes to User Information</td>
-	<td></td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/vivo/</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Must not be logged in already</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Log in</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Try to log in with original username</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>username</td>
-	<td>Rick Rookie</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>password</td>
-	<td>resetPasswd</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>(unknown username)</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Unknown username</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Now log in with new username (and new password)</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></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></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Logout</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO</td>
-	<td></td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CreateNewNobodyUser.html b/utilities/acceptance-tests/suites/CreateAccounts/CreateNewSelfEditorUser.html
similarity index 95%
rename from utilities/acceptance-tests/suites/CreateAccounts/CreateNewNobodyUser.html
rename to utilities/acceptance-tests/suites/CreateAccounts/CreateNewSelfEditorUser.html
index c6cc0d4f..33f06d05 100644
--- a/utilities/acceptance-tests/suites/CreateAccounts/CreateNewNobodyUser.html
+++ b/utilities/acceptance-tests/suites/CreateAccounts/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/CreateAccounts/DeleteNewNobodyUser.html b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewSelfEditorUser.html
similarity index 83%
rename from utilities/acceptance-tests/suites/CreateAccounts/DeleteNewNobodyUser.html
rename to utilities/acceptance-tests/suites/CreateAccounts/DeleteNewSelfEditorUser.html
index 230a8117..4a92f6fb 100644
--- a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewNobodyUser.html
+++ b/utilities/acceptance-tests/suites/CreateAccounts/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>DeleteNewNobodyUser</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">DeleteNewNobodyUser</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">Delete new nobogy user</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,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,16 @@
 	<td class="comment">Go to User Accounts</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO Site Administration</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=User accounts</td>
@@ -106,7 +116,7 @@
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=Richard Rookie</td>
+	<td>link=Eddie Editor</td>
 	<td></td>
 </tr>
 <tr>
@@ -116,7 +126,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Richard Rookie</td>
+	<td>link=Eddie Editor</td>
 	<td></td>
 </tr>
 <tr>
@@ -161,7 +171,7 @@
 </tr>
 <tr>
 	<td>verifyElementNotPresent</td>
-	<td>link=Richard Rookie</td>
+	<td>link=Eddie Editor</td>
 	<td></td>
 </tr>
 <tr>
@@ -169,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>
@@ -179,7 +194,6 @@
 	<td>VIVO</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/EditUserNobodyInfo.html b/utilities/acceptance-tests/suites/CreateAccounts/EditUserNobodyInfo.html
deleted file mode 100644
index d4e80b13..00000000
--- a/utilities/acceptance-tests/suites/CreateAccounts/EditUserNobodyInfo.html
+++ /dev/null
@@ -1,260 +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 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>
-<style type="text/css">
-.testName {
-  color: blue;
-  background: rgb(80%, 80%, 80%);
-  font-family: sans-serif;
-  font-weight: bold;
-  font-size: larger;
-  text-align: center;
-}
-.comment {
-  color: blue;
-  background: rgb(80%, 80%, 80%);
-  font-family: sans-serif;
-  font-weight: bold;
-  font-size: larger;
-  text-align: center;
-}
-</style>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3" class="testName">EditUserNobodyInfo</td></tr>
-</thead><tbody>
-<tr>
-	<td>deleteAllVisibleCookies</td>
-	<td></td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Edit User Information</td>
-	<td></td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/vivo/</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Must not be logged in already</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Log in</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Must login as site admin</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>username</td>
-	<td>testAdmin</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>password</td>
-	<td>Password</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">Go to user management for our new user account</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=User accounts</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>User Accounts</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Rick Rookie</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 editing form</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>//input[@value='Edit User Account']</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>User Account Editing Form</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Change the User Name and the Last Name</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></td>
-</tr>
-<tr>
-	<td>assertAlert</td>
-	<td>The passwords do not match.</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></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>User Account Control Panel</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Logout</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Log out</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO</td>
-	<td></td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeNobodyLogin.html b/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeSelfEditorLogin.html
similarity index 58%
rename from utilities/acceptance-tests/suites/CreateAccounts/FirstTimeNobodyLogin.html
rename to utilities/acceptance-tests/suites/CreateAccounts/FirstTimeSelfEditorLogin.html
index 7934b201..ecd9cf1e 100644
--- a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeNobodyLogin.html
+++ b/utilities/acceptance-tests/suites/CreateAccounts/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/CreateAccounts/Suite.html b/utilities/acceptance-tests/suites/CreateAccounts/Suite.html
index 80b84a81..537dff58 100644
--- a/utilities/acceptance-tests/suites/CreateAccounts/Suite.html
+++ b/utilities/acceptance-tests/suites/CreateAccounts/Suite.html
@@ -1,30 +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="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="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="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/CreateAccounts/TryNewNobodyPassword.html b/utilities/acceptance-tests/suites/CreateAccounts/TryNewSelfEditorPassword.html
similarity index 86%
rename from utilities/acceptance-tests/suites/CreateAccounts/TryNewNobodyPassword.html
rename to utilities/acceptance-tests/suites/CreateAccounts/TryNewSelfEditorPassword.html
index 8fe3a2e7..2d2b1993 100644
--- a/utilities/acceptance-tests/suites/CreateAccounts/TryNewNobodyPassword.html
+++ b/utilities/acceptance-tests/suites/CreateAccounts/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>

ConfirmEditedNobodyInfo
deleteAllVisibleCookies
comment	Confirm Changes to User Information
open	/vivo/
assertTitle	VIVO
comment	Must not be logged in already
clickAndWait	link=Log in
assertTitle	VIVO Site Administration
comment	Try to log in with original username
type	username	Rick Rookie
type	password	resetPasswd
clickAndWait	loginSubmitMode
assertTitle	VIVO Site Administration
verifyTextPresent	(unknown username)
verifyTextPresent	Unknown username
comment	Now log in with new username (and new password)
type	username	Richard Rookie
type	password	resetPasswd
clickAndWait	loginSubmitMode
assertTitle	VIVO Site Administration
verifyTextPresent	Logged in as
verifyTextPresent	Richard Rookie
comment	Logout
clickAndWait	loginSubmitMode
assertTitle	VIVO
EditUserNobodyInfo
deleteAllVisibleCookies
comment	Edit User Information
open	/vivo/
assertTitle	VIVO
comment	Must not be logged in already
clickAndWait	link=Log in
assertTitle	VIVO Site Administration
comment	Must login as site admin
type	username	testAdmin
type	password	Password
clickAndWait	loginSubmitMode
assertTitle	VIVO Site Administration
comment	Go to user management for our new user account
clickAndWait	link=User accounts
assertTitle	User Accounts
clickAndWait	link=Rick Rookie
assertTitle	User Account Control Panel
comment	Open the editing form
clickAndWait	//input[@value='Edit User Account']
assertTitle	User Account Editing Form
comment	Change the User Name and the Last Name
type	Username	Richard Rookie
type	FirstName	Richard
clickAndWait	primaryAction
assertTitle	User Account Control Panel
comment	Open the Reset Password form
clickAndWait	//input[@value='Reset Password']
assertTitle	User Account Editing Form
comment	Try two passwords that don't match
type	Md5password	otherPassword
type	passwordConfirmation	somethingElse
click	primaryAction
assertAlert	The passwords do not match.
comment	Try passwords that match, but are too long
type	passwordConfirmation	otherPassword
click	primaryAction
assertAlert	Please enter a password between 6 and 12 characters long.
comment	Try a good password, with a good match.
type	Md5password	resetPasswd
type	passwordConfirmation	resetPasswd
clickAndWait	primaryAction
assertTitle	User Account Control Panel
comment	Logout
clickAndWait	link=Log out
assertTitle	VIVO