diff --git a/tests/acceptance/features/bootstrap/UsersSettingsContext.php b/tests/acceptance/features/bootstrap/UsersSettingsContext.php
index 6b3e66975c3a7..59d40d7e86fa0 100644
--- a/tests/acceptance/features/bootstrap/UsersSettingsContext.php
+++ b/tests/acceptance/features/bootstrap/UsersSettingsContext.php
@@ -71,7 +71,7 @@ public static function createNewUserButton() {
 	 * @return Locator
 	 */
 	public static function rowForUser($user) {
-		return Locator::forThe()->xpath("//table[@id = 'userlist']//th[@data-uid='$user']/..")->
+		return Locator::forThe()->xpath("//table[@id = 'userlist']//tr[normalize-space() = '$user']/..")->
 				describedAs("Row for user $user in Users Settings");
 	}
 
diff --git a/tests/acceptance/features/login.feature b/tests/acceptance/features/login.feature
index b30a1fc30fce2..9d3b1c1fc75b9 100644
--- a/tests/acceptance/features/login.feature
+++ b/tests/acceptance/features/login.feature
@@ -17,6 +17,7 @@ Feature: login
     When I act as Jane
     And I am logged in as the admin
     And I open the User settings
+    And I see that the list of users contains the user user0
     And I set the password for user0 to 654321
     And I see that the "Password successfully changed" notification is shown
     And I act as John