diff --git a/utilities/acceptance-tests/suites/user-management/BookmarkWithoutLoggingIn.html b/utilities/acceptance-tests/suites/user-management/BookmarkWithoutLoggingIn.html
index df900a2d..58b040ff 100644
--- a/utilities/acceptance-tests/suites/user-management/BookmarkWithoutLoggingIn.html
+++ b/utilities/acceptance-tests/suites/user-management/BookmarkWithoutLoggingIn.html
@@ -52,7 +52,7 @@
 <tr>
 	<td>type</td>
 	<td>username</td>
-	<td>defaultAdmin</td>
+	<td>testAdmin</td>
 </tr>
 <tr>
 	<td>type</td>
@@ -85,7 +85,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>click</td>
+	<td>clickAndWait</td>
 	<td>link=Log out</td>
 	<td></td>
 </tr>
diff --git a/utilities/acceptance-tests/suites/user-management/ConfirmEditedInfo.html b/utilities/acceptance-tests/suites/user-management/ConfirmEditedInfo.html
index 4277f88d..ac4371ab 100644
--- a/utilities/acceptance-tests/suites/user-management/ConfirmEditedInfo.html
+++ b/utilities/acceptance-tests/suites/user-management/ConfirmEditedInfo.html
@@ -57,7 +57,7 @@
 <tr>
 	<td>type</td>
 	<td>username</td>
-	<td>User Mgmt</td>
+	<td>Joe User</td>
 </tr>
 <tr>
 	<td>type</td>
@@ -92,7 +92,7 @@
 <tr>
 	<td>type</td>
 	<td>username</td>
-	<td>User Management</td>
+	<td>Joe Yuser</td>
 </tr>
 <tr>
 	<td>type</td>
@@ -116,7 +116,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>User Management</td>
+	<td>Joe Yuser</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/user-management/CreateNewUser.html b/utilities/acceptance-tests/suites/user-management/CreateNewUser.html
index 0e5c6adf..40a3acaf 100644
--- a/utilities/acceptance-tests/suites/user-management/CreateNewUser.html
+++ b/utilities/acceptance-tests/suites/user-management/CreateNewUser.html
@@ -41,7 +41,7 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Login as defaultAdmin</td>
+	<td class="comment">Login as testAdmin</td>
 	<td></td>
 </tr>
 <tr>
@@ -57,7 +57,7 @@
 <tr>
 	<td>type</td>
 	<td>username</td>
-	<td>defaultAdmin</td>
+	<td>testAdmin</td>
 </tr>
 <tr>
 	<td>type</td>
@@ -102,22 +102,22 @@
 <tr>
 	<td>type</td>
 	<td>Username</td>
-	<td>User Mgmt</td>
+	<td>Joe User</td>
 </tr>
 <tr>
 	<td>type</td>
 	<td>FirstName</td>
-	<td>User</td>
+	<td>Joe</td>
 </tr>
 <tr>
 	<td>type</td>
 	<td>LastName</td>
-	<td>Mgmt</td>
+	<td>User</td>
 </tr>
 <tr>
 	<td>type</td>
 	<td>Md5password</td>
-	<td>UserMgmt</td>
+	<td>joePassword</td>
 </tr>
 <tr>
 	<td>comment</td>
@@ -147,7 +147,7 @@
 <tr>
 	<td>type</td>
 	<td>passwordConfirmation</td>
-	<td>UserMgmt</td>
+	<td>joePassword</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -167,17 +167,17 @@
 <tr>
 	<td>verifyText</td>
 	<td>//tr[1]/td[2]</td>
-	<td>User Mgmt</td>
+	<td>Joe User</td>
 </tr>
 <tr>
 	<td>verifyText</td>
 	<td>//tr[2]/td[2]</td>
-	<td>User</td>
+	<td>Joe</td>
 </tr>
 <tr>
 	<td>verifyText</td>
 	<td>//tr[3]/td[2]</td>
-	<td>Mgmt</td>
+	<td>User</td>
 </tr>
 <tr>
 	<td>verifyText</td>
diff --git a/utilities/acceptance-tests/suites/user-management/DeleteNewUser.html b/utilities/acceptance-tests/suites/user-management/DeleteNewUser.html
index d270dbaf..06aa40e3 100644
--- a/utilities/acceptance-tests/suites/user-management/DeleteNewUser.html
+++ b/utilities/acceptance-tests/suites/user-management/DeleteNewUser.html
@@ -57,7 +57,7 @@
 <tr>
 	<td>type</td>
 	<td>username</td>
-	<td>defaultAdmin</td>
+	<td>testAdmin</td>
 </tr>
 <tr>
 	<td>type</td>
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=User Management</td>
+	<td>link=Joe Yuser</td>
 	<td></td>
 </tr>
 <tr>
@@ -101,7 +101,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=User Management</td>
+	<td>link=Joe Yuser</td>
 	<td></td>
 </tr>
 <tr>
@@ -146,7 +146,7 @@
 </tr>
 <tr>
 	<td>verifyElementNotPresent</td>
-	<td>link=User Management</td>
+	<td>link=Joe Yuser</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/user-management/EditUserInfo.html b/utilities/acceptance-tests/suites/user-management/EditUserInfo.html
index a0d2c33e..1d5849d2 100644
--- a/utilities/acceptance-tests/suites/user-management/EditUserInfo.html
+++ b/utilities/acceptance-tests/suites/user-management/EditUserInfo.html
@@ -57,7 +57,7 @@
 <tr>
 	<td>type</td>
 	<td>username</td>
-	<td>defaultAdmin</td>
+	<td>testAdmin</td>
 </tr>
 <tr>
 	<td>type</td>
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=User Mgmt</td>
+	<td>link=Joe User</td>
 	<td></td>
 </tr>
 <tr>
@@ -122,12 +122,12 @@
 <tr>
 	<td>type</td>
 	<td>Username</td>
-	<td>User Management</td>
+	<td>Joe Yuser</td>
 </tr>
 <tr>
 	<td>type</td>
 	<td>LastName</td>
-	<td>Management</td>
+	<td>Yuser</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
diff --git a/utilities/acceptance-tests/suites/user-management/FirstTimeLogin.html b/utilities/acceptance-tests/suites/user-management/FirstTimeLogin.html
index f86b991b..7dda219a 100644
--- a/utilities/acceptance-tests/suites/user-management/FirstTimeLogin.html
+++ b/utilities/acceptance-tests/suites/user-management/FirstTimeLogin.html
@@ -62,7 +62,7 @@
 <tr>
 	<td>type</td>
 	<td>username</td>
-	<td>User Mgmt</td>
+	<td>Joe User</td>
 </tr>
 <tr>
 	<td>type</td>
@@ -97,7 +97,7 @@
 <tr>
 	<td>type</td>
 	<td>password</td>
-	<td>UserMgmt</td>
+	<td>joePassword</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -231,7 +231,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>User Mgmt</td>
+	<td>Joe User</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/user-management/Suite.html b/utilities/acceptance-tests/suites/user-management/Suite.html
index db031abc..f683c16b 100644
--- a/utilities/acceptance-tests/suites/user-management/Suite.html
+++ b/utilities/acceptance-tests/suites/user-management/Suite.html
@@ -8,7 +8,6 @@
 <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="SetPasswordOnDefaultAdmin.html">SetPasswordOnDefaultAdmin</a></td></tr>
 <tr><td><a href="CreateNewUser.html">Create New User</a></td></tr>
 <tr><td><a href="FirstTimeLogin.html">First Time Login</a></td></tr>
 <tr><td><a href="TryNewPassword.html">Try New Password</a></td></tr>
diff --git a/utilities/acceptance-tests/suites/user-management/TryNewPassword.html b/utilities/acceptance-tests/suites/user-management/TryNewPassword.html
index d21a768d..76283e40 100644
--- a/utilities/acceptance-tests/suites/user-management/TryNewPassword.html
+++ b/utilities/acceptance-tests/suites/user-management/TryNewPassword.html
@@ -52,7 +52,7 @@
 <tr>
 	<td>type</td>
 	<td>username</td>
-	<td>User Mgmt</td>
+	<td>Joe User</td>
 </tr>
 <tr>
 	<td>type</td>
@@ -81,7 +81,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>User Mgmt</td>
+	<td>Joe User</td>
 	<td></td>
 </tr>
 <tr>