diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
index deb8bc9e4..b0acdd92e 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
@@ -34,7 +34,7 @@
               {{each(j, columnDefinition) columns}}
               <td>${ typeof columnDefinition.rowText == 'function' ? columnDefinition.rowText(row) : row[columnDefinition.rowText] }</td>
               {{/each}}
-              <td><a href="#" data-bind="click: function(){ editUserBox(row) }">Edit</a></td>
+              <td id="users-grid-user-id-${row.username()}"><a href="#" data-bind="click: function(){ editUserBox(row) }">Edit</a></td>
               {{if row.username()=="admin" || row.username()=="guest"}}
                 <td></td>
               {{else}}
diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
index f7e51cb4f..dd5dab4c3 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
@@ -236,6 +236,7 @@ public abstract class AbstractArchivaTest
         clickLinkWithLocator( "user-create-form-register-button", true );
 
         assertTextPresent( "user created:"+userName );
+        assertElementPresent( "users-grid-user-id-"+userName );
 
         if ( valid )
         {
@@ -268,7 +269,7 @@ public abstract class AbstractArchivaTest
 
         clickLinkWithLocator( "alert-message-success-close-a" );
 
-        assertTextNotPresent( userName );
+        assertElementNotPresent( "users-grid-user-id-"+userName );
         assertTextNotPresent( fullName );