diff --git a/webapp/e2e/steps/logout.steps.js b/webapp/e2e/steps/logout.steps.js
index 7e10e8d3..f47c2ee0 100644
--- a/webapp/e2e/steps/logout.steps.js
+++ b/webapp/e2e/steps/logout.steps.js
@@ -32,8 +32,8 @@ defineFeature(feature, (test) => {
       password = "Testpassword1";
       await page.waitForSelector("#login-username");
       await page.type("#login-username", username);
-      await page.waitForSelector("#register-password");
-      await page.type("#register-password", password);
+      await page.waitForSelector("#login-password");
+      await page.type("#login-password", password);
       await page.click("button", { text: "Login" });
       await page.waitForNavigation({ waitUntil: "networkidle0" });
     });
diff --git a/webapp/e2e/steps/play-calculator.steps.js b/webapp/e2e/steps/play-calculator.steps.js
index 2f3db9d7..f076de46 100644
--- a/webapp/e2e/steps/play-calculator.steps.js
+++ b/webapp/e2e/steps/play-calculator.steps.js
@@ -24,8 +24,10 @@ defineFeature(feature, (test) => {
   test("The user can answer a question on Human Calculator mode", ({ given, when, then }) => {
     given("A logged-in user", async () => {
 
-      await page.type("#login-username", "testuser");
-      await page.type("#login-password", "Testpassword1");
+      await page.waitForSelector("#login-username");
+      await page.type("#login-username", username);
+      await page.waitForSelector("#login-password");
+      await page.type("#login-password", password);
       await page.click("button", { text: "Login" });
       await page.waitForNavigation();
     });
diff --git a/webapp/e2e/steps/play-classic.steps.js b/webapp/e2e/steps/play-classic.steps.js
index 9fd3c658..8bd2e372 100644
--- a/webapp/e2e/steps/play-classic.steps.js
+++ b/webapp/e2e/steps/play-classic.steps.js
@@ -24,8 +24,10 @@ defineFeature(feature, (test) => {
   test("The user can answer a question on Classic mode", ({ given, when, then }) => {
     given("A logged-in user", async () => {
 
-      await page.type("#login-username", "testuser");
-      await page.type("#login-password", "Testpassword1");
+      await page.waitForSelector("#login-username");
+      await page.type("#login-username", username);
+      await page.waitForSelector("#login-password");
+      await page.type("#login-password", password);
       await page.click("button", { text: "Login" });
       await page.waitForNavigation();
     });