diff --git a/frontend/views/containers/access/PasswordModal.vue b/frontend/views/containers/access/PasswordModal.vue
index c8302ca7e..c13d802a8 100644
--- a/frontend/views/containers/access/PasswordModal.vue
+++ b/frontend/views/containers/access/PasswordModal.vue
@@ -1,5 +1,5 @@
 <template lang='pug'>
-modal-template(class='is-centered is-left-aligned' back-on-mobile=true ref='modalTemplate' :a11yTitle='L("Change Password")')
+modal-template(class='is-centered is-left-aligned' back-on-mobile=true ref='modalTemplate' data-test='PasswordModal' :a11yTitle='L("Change Password")')
   template(slot='title') Change password
 
   form(
@@ -50,11 +50,13 @@ modal-template(class='is-centered is-left-aligned' back-on-mobile=true ref='moda
     .buttons
       i18n.is-outlined(
         tag='button'
+        data-test='cancel'
         @click='closeModal'
       ) Cancel
 
       i18n.is-success(
         tag='button'
+        data-test='submit'
         @click='changePassword'
         :disabled='$v.form.$invalid || processing'
       ) Change password
diff --git a/test/cypress/integration/signup-and-login.spec.js b/test/cypress/integration/signup-and-login.spec.js
index a58ad2be8..0574529c2 100644
--- a/test/cypress/integration/signup-and-login.spec.js
+++ b/test/cypress/integration/signup-and-login.spec.js
@@ -113,4 +113,33 @@ describe('Signup, Profile and Login', () => {
 
     cy.closeModal()
   })
+
+  it('change user password', () => {
+    cy.giLogin(username)
+    cy.getByDT('settingsBtn').click()
+    cy.getByDT('passwordBtn').click()
+    const oldPassword = '123456789'
+    const newPassword = 'abcdefghi'
+    cy.getByDT('PasswordModal').within(() => {
+      cy.getByDT('current').type('{selectall}{del}' + oldPassword)
+      cy.getByDT('newPassword').type('{selectall}{del}' + newPassword)
+      cy.getByDT('confirm').type('{selectall}{del}' + newPassword)
+      cy.getByDT('submit').click()
+    })
+    cy.getByDT('PasswordModal').should('not.exist')
+    cy.giLogout({ bypassUI: true })
+
+    // Login using old password
+    cy.getByDT('loginBtn').click()
+    cy.getByDT('loginName').type('{selectall}{del}' + username)
+    cy.getByDT('password').type('{selectall}{del}' + oldPassword)
+
+    cy.getByDT('loginSubmit').click()
+    cy.getByDT('loginError').should('contain', 'Incorrect username or password')
+    cy.closeModal()
+
+    // Now, log in with the correct changed password
+    cy.giLogin(username, { password: newPassword })
+    cy.giLogout({ bypassUI: true })
+  })
 })