diff --git a/e2e/support/commands.js b/e2e/support/commands.js
index 2978fd7..2ebd282 100644
--- a/e2e/support/commands.js
+++ b/e2e/support/commands.js
@@ -43,12 +43,13 @@ Cypress.Commands.add("ayLogin", (user, urlAfterLogin) => {
     urlAfterLogin = "/ay-evaluate";
   }
   cy.visit("/login");
+  cy.get("input[name=username]").clear();
+  cy.get("input[name=password]").clear();
 
   cy.get("input[name=username]").clear().type(Cypress.env(user).login);
 
   // {enter} causes the form to submit
-  cy.get("input[name=password]")
-    .clear()
+  cy.get("input[name=password]").clear()
     .type(`${Cypress.env(user).password}{enter}`);
 
   cy.url().should("include", urlAfterLogin);