diff --git a/Features/Context/Users.php b/Features/Context/Users.php
index 9bd040d20..170a59073 100644
--- a/Features/Context/Users.php
+++ b/Features/Context/Users.php
@@ -40,6 +40,8 @@ public function iCreateUser(TableNode $users = null)
      */
     public function goToUserPage($username)
     {
+        $this->iAmOnPage('Users');
+        $this->waitWhileLoading();
         $this->clickOnTreePath("$username $username");
         $this->sleep(); //safeguard for application delays
     }
diff --git a/Features/Users/users.feature b/Features/Users/users.feature
index 9d463691f..2a3377185 100644
--- a/Features/Users/users.feature
+++ b/Features/Users/users.feature
@@ -70,8 +70,7 @@ Feature: Use the eZ Users field
 
     @javascript @edge
     Scenario: Validate that users have the "Delete" button available
-        Given I am on the Users page
-        And there is a User with name "One"
+        Given there is a User with name "One"
         When I go to User "One" page
         Then I should not see a "Send to thrash" action bar button
         And I should see a "Delete" action bar button