diff --git a/packages/lesspass-pure/cypress/integration/connectedMode.spec.js b/packages/lesspass-pure/cypress/integration/connectedMode.spec.js
index 00b3738..c0dba3b 100644
--- a/packages/lesspass-pure/cypress/integration/connectedMode.spec.js
+++ b/packages/lesspass-pure/cypress/integration/connectedMode.spec.js
@@ -17,7 +17,9 @@ describe("Connected Mode", function() {
     cy.get("#generatePassword__btn").click();
     cy.get("#generated-password").should("have.value", "hjV@\\5ULp3bIs,6B");
     cy.get(".fa-save").should("be.visible");
-    cy.get(".fa-sign-out").click();
+    cy.get(".fa-user").first().click();
+    cy.get("#signOutButton").should("be.visible");
+    cy.get("#signOutButton").click();
     cy.get(".fa-save").should("not.be.visible");
   });
   it("can log in and log out", function() {
@@ -32,8 +34,8 @@ describe("Connected Mode", function() {
     cy.get("#signInButton").click();
     cy.get("#siteField").should("be.visible");
     cy.get(".fa-key").should("be.visible");
-    cy.get(".fa-sign-out").click();
-    cy.wait(5000);
+    cy.get(".fa-user").first().click();
+    cy.get("#signOutButton").click();
     cy.get(".fa-key").should("not.be.visible");
   });
   it("reset password page", function() {
@@ -59,6 +61,7 @@ describe("Connected Mode", function() {
       .click();
     cy.get("#siteField").should("have.value", "example.org");
     cy.get("#login").should("have.value", "contact@example.org");
-    cy.get(".fa-sign-out").click();
+    cy.get(".fa-user").first().click();
+    cy.get("#signOutButton").click();
   });
 });
diff --git a/packages/lesspass-pure/src/views/MyAccount.vue b/packages/lesspass-pure/src/views/MyAccount.vue
index 3a6e5e2..a1c6395 100644
--- a/packages/lesspass-pure/src/views/MyAccount.vue
+++ b/packages/lesspass-pure/src/views/MyAccount.vue
@@ -41,14 +41,14 @@
       </div>
       <div class="form-group row">
         <div class="col-12">
-          <button id="loginButton" class="btn btn-primary btn-block">
+          <button id="changeMyPasswordButton" class="btn btn-primary btn-block">
             {{ $t("Change my password") }}
           </button>
         </div>
       </div>
     </form>
     <hr />
-    <button class="btn btn-success btn-block" type="button" v-on:click="logout">
+    <button id="signOutButton" class="btn btn-success btn-block" type="button" v-on:click="logout">
       {{ $t("Sign out") }}
     </button>
   </div>
diff --git a/packages/lesspass-pure/src/views/PasswordResetConfirm.vue b/packages/lesspass-pure/src/views/PasswordResetConfirm.vue
index 7fe5ad4..a6d4eab 100644
--- a/packages/lesspass-pure/src/views/PasswordResetConfirm.vue
+++ b/packages/lesspass-pure/src/views/PasswordResetConfirm.vue
@@ -28,7 +28,7 @@
     </div>
     <div class="form-group row">
       <div class="col-12">
-        <button id="loginButton" class="btn btn-primary btn-block">
+        <button id="resetMyPasswordButton" class="btn btn-primary btn-block">
           {{ $t("Reset my password") }}
         </button>
       </div>