diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CreateNewCuratorUser.html b/utilities/acceptance-tests/suites/CreateAccounts/CreateNewCuratorUser.html
index 617eb360..e61a84da 100644
--- a/utilities/acceptance-tests/suites/CreateAccounts/CreateNewCuratorUser.html
+++ b/utilities/acceptance-tests/suites/CreateAccounts/CreateNewCuratorUser.html
@@ -71,17 +71,17 @@
 </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>
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html
index 17f3ff93..23849038 100644
--- a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html
+++ b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html
@@ -71,17 +71,17 @@
 </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>
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html
index 93569848..c48e2a9f 100644
--- a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html
+++ b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html
@@ -71,17 +71,17 @@
 </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>
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeCuratorLogin.html b/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeCuratorLogin.html
index fc0d3966..70fa342c 100644
--- a/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeCuratorLogin.html
+++ b/utilities/acceptance-tests/suites/CreateAccounts/FirstTimeCuratorLogin.html
@@ -64,6 +64,31 @@
 	<td>VIVO Site Administration</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Log in</td>
+	<td></td>
+</tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">Try no password</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>loginName</td>
+	<td>Connie Curator</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>loginPassword</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>loginForm</td>
+	<td></td>
+</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Try the wrong password</td>
@@ -71,17 +96,17 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>username</td>
+	<td>loginName</td>
 	<td>Connie Curator</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>
@@ -91,12 +116,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>(1st login; initial password entered incorrectly)</td>
+	<td>Log in</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>
@@ -106,12 +131,17 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>password</td>
+	<td>loginName</td>
+	<td>Connie Curator</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>
@@ -121,12 +151,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>(1st login; changing to new private password)</td>
+	<td>Create Your New Password</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Please now choose a private password</td>
+	<td>Please enter a password with more than 5 characters</td>
 	<td></td>
 </tr>
 <tr>
@@ -136,92 +166,77 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>password</td>
+	<td>newPassword</td>
+	<td>junk</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>confirmPassword</td>
 	<td>junk</td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>loginSubmitMode</td>
+	<td>passwordChangeForm</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Create Your New Password</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Please enter a password with more than 5 characters</td>
+	<td></td>
+</tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">Now try a valid password, but not the same on in each box</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>click</td>
+	<td>passwordChangeForm</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO Site Administration</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertAlert</td>
-	<td>Please enter a password between 6 and 12 characters long</td>
+	<td>Passwords do not match</td>
 	<td></td>
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Now try a valid one</td>
+	<td class="comment">Now try a valid password</td>
 	<td></td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>password</td>
+	<td>newPassword</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>confirmPassword</td>
 	<td>newPassword</td>
 </tr>
 <tr>
-	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>click</td>
+	<td>passwordChangeForm</td>
 	<td></td>
 </tr>
 <tr>
@@ -236,12 +251,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Logged in as</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Connie Curator</td>
+	<td>Logged in as Connie Curator</td>
 	<td></td>
 </tr>
 <tr>
@@ -251,7 +261,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>loginSubmitMode</td>
+	<td>link=Log out</td>
 	<td></td>
 </tr>
 <tr>