diff --git a/e2e-tests/cypress/tests/cypress/support/step_definitions/common_steps.ts b/e2e-tests/cypress/tests/cypress/support/step_definitions/common_steps.ts
index 42142380b..881394e6d 100644
--- a/e2e-tests/cypress/tests/cypress/support/step_definitions/common_steps.ts
+++ b/e2e-tests/cypress/tests/cypress/support/step_definitions/common_steps.ts
@@ -18,6 +18,18 @@ Given(
 
 Then("the user is logged in with username {string}", (username: string) => {
   const overviewPage = new OverviewPage();
+  cy.intercept("POST", "/graphql", (req) => {
+    if (
+      req.body.hasOwnProperty("query") &&
+      req.body.query.includes("mutation")
+    ) {
+      req.alias = "login";
+    }
+  });
+  cy.wait("@login").then((interception) => {
+    expect(interception.response.statusCode).equals(200);
+    expect(JSON.stringify(interception.response.body)).contains(email);
+  });
   cy.url().should("include", "/overview");
   cy.get(overviewPage.navbarName).should("contain", username);
 });
diff --git a/e2e-tests/cypress/tests/cypress/support/step_definitions/user_authentication_steps.ts b/e2e-tests/cypress/tests/cypress/support/step_definitions/user_authentication_steps.ts
index d469180b3..67a64eba0 100644
--- a/e2e-tests/cypress/tests/cypress/support/step_definitions/user_authentication_steps.ts
+++ b/e2e-tests/cypress/tests/cypress/support/step_definitions/user_authentication_steps.ts
@@ -16,22 +16,9 @@ When("the user submits no credentials", () => {
 When(
   "the user submits the credentials {string} {string}",
   (email: string, password: string) => {
-    cy.intercept("POST", "/graphql", (req) => {
-      if (
-        req.body.hasOwnProperty("query") &&
-        req.body.query.includes("mutation")
-      ) {
-        req.alias = "login";
-      }
-    });
-
     loginPage.enterEmail(email);
     loginPage.enterPassword(password);
     loginPage.submitLogin();
-    cy.wait("@login").then((interception) => {
-      expect(interception.response.statusCode).equals(200);
-      expect(JSON.stringify(interception.response.body)).contains(email);
-    });
   }
 );