diff --git a/webapp/components/Password/Change.spec.js b/webapp/components/Password/Change.spec.js
index 98a66da72..e54514d78 100644
--- a/webapp/components/Password/Change.spec.js
+++ b/webapp/components/Password/Change.spec.js
@@ -1,5 +1,5 @@
 import { mount, createLocalVue } from '@vue/test-utils'
-import ChangePassword from './ChangePassword.vue'
+import ChangePassword from './Change.vue'
 import Vue from 'vue'
 import Styleguide from '@human-connection/styleguide'
 
@@ -10,6 +10,7 @@ localVue.use(Styleguide)
 describe('ChangePassword.vue', () => {
   let mocks
   let wrapper
+  let data
 
   beforeEach(() => {
     mocks = {
@@ -34,7 +35,7 @@ describe('ChangePassword.vue', () => {
   describe('mount', () => {
     let wrapper
     const Wrapper = () => {
-      return mount(ChangePassword, { mocks, localVue })
+      return mount(ChangePassword, { mocks, localVue, data })
     }
 
     beforeEach(() => {
@@ -97,8 +98,8 @@ describe('ChangePassword.vue', () => {
       })
 
       describe('submit form', () => {
-        beforeEach(() => {
-          wrapper.find('form').trigger('submit')
+        beforeEach(async () => {
+          await wrapper.find('form').trigger('submit')
         })
 
         it('calls changePassword mutation', () => {
@@ -119,18 +120,19 @@ describe('ChangePassword.vue', () => {
 
         describe('mutation resolves', () => {
           beforeEach(() => {
-            mocks.$apollo.mutate = jest.fn().mockResolvedValue()
-            wrapper = Wrapper()
+            wrapper.find('form').trigger('submit')
+            // mocks.$apollo.mutate = jest.fn().mockResolvedValue()
+            // wrapper = Wrapper()
           })
 
-          it('calls auth/SET_TOKEN with response', () => {
+          it('calls auth/SET_TOKEN with response', async () => {
             expect(mocks.$store.commit).toHaveBeenCalledWith(
               'auth/SET_TOKEN',
               'NEWTOKEN'
             )
           })
 
-          it('displays success message', () => {
+          it('displays success message', async () => {
             expect(mocks.$t).toHaveBeenCalledWith(
               'settings.security.change-password.success'
             )
@@ -140,11 +142,16 @@ describe('ChangePassword.vue', () => {
 
         describe('mutation rejects', () => {
           beforeEach(() => {
-            // second call will reject
-            wrapper.find('form').trigger('submit')
+            wrapper.find('input#oldPassword').setValue('supersecret')
+            wrapper.find('input#newPassword').setValue('supersecret')
+            wrapper.find('input#confirmPassword').setValue('supersecret')
           })
 
-          it('displays error message', () => {
+          it('displays error message', async () => {
+            await wrapper.find('form').trigger('submit')
+            await wrapper.find('form').trigger('submit')
+            await mocks.$apollo.mutate
+
             expect(mocks.$toast.error).toHaveBeenCalledWith('Ouch!')
           })
         })
diff --git a/webapp/components/Password/Change.vue b/webapp/components/Password/Change.vue
index 742f5a1df..4998bbfb4 100644
--- a/webapp/components/Password/Change.vue
+++ b/webapp/components/Password/Change.vue
@@ -25,13 +25,15 @@
         type="password"
         :label="$t('settings.security.change-password.label-new-password-confirm')"
       />
-      <password-strength :password="formData.newPassword"/>
+      <password-strength :password="formData.newPassword" />
       <ds-space margin-top="base">
         <ds-button
           :loading="loading"
           :disabled="disabled"
           primary
-        >{{ $t('settings.security.change-password.button') }}</ds-button>
+        >
+          {{ $t('settings.security.change-password.button') }}
+        </ds-button>
       </ds-space>
     </template>
   </ds-form>
diff --git a/webapp/components/Password/Strength.vue b/webapp/components/Password/Strength.vue
index e10f949f3..5368248d7 100644
--- a/webapp/components/Password/Strength.vue
+++ b/webapp/components/Password/Strength.vue
@@ -1,10 +1,16 @@
 <template>
   <div class="field">
     <div class="password-strength-meter">
-      <div class="password-strength-meter-inner" :class="strengthClass"></div>
+      <div
+        class="password-strength-meter-inner"
+        :class="strengthClass"
+      />
     </div>
     <p class="help">
-      <span v-if="this.pass" :class="{ insecure: (passwordStrength < 3) }">
+      <span
+        v-if="pass"
+        :class="{ insecure: (passwordStrength < 3) }"
+      >
         {{ $t('settings.security.change-password.passwordSecurity') }}:
         <strong>{{ $t(`settings.security.change-password.passwordStrength${passwordStrength}`) }}</strong>
       </span>
@@ -18,26 +24,25 @@ import zxcvbn from 'zxcvbn'
 import { isEmpty } from 'lodash'
 
 export default {
+  name: 'PasswordMeter',
   props: {
     password: {
       type: String,
       required: true
     }
   },
-  name: 'password-meter',
   data() {
     return {
       lastScore: 0,
       pass: this.password || null
     }
   },
-  watch: {
-    password(pass) {
-      // update password when prop is changing
-      this.pass = pass || null
+  computed: {
+    strengthClass() {
+      return `strength-${this.passwordStrength}`
     }
   },
-  computed: {
+  watch: {
     /**
      * passwordStrength is the score calculated by zxcvbn
      * @return {Number} Password Strength Score
@@ -53,8 +58,9 @@ export default {
       }
       return score
     },
-    strengthClass() {
-      return `strength-${this.passwordStrength}`
+    password(pass) {
+      // update password when prop is changing
+      this.pass = pass || null
     }
   }
 }
diff --git a/webapp/pages/settings/security.vue b/webapp/pages/settings/security.vue
index a95e14cec..ac95ff26e 100644
--- a/webapp/pages/settings/security.vue
+++ b/webapp/pages/settings/security.vue
@@ -1,6 +1,6 @@
 <template>
   <ds-card :header="$t('settings.security.name')">
-    <change-password/>
+    <change-password />
   </ds-card>
 </template>
 
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index f4db3be3e..75a8de6fd 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -763,10 +763,10 @@
   resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
   integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==
 
-"@human-connection/styleguide@0.5.15":
-  version "0.5.15"
-  resolved "https://registry.yarnpkg.com/@human-connection/styleguide/-/styleguide-0.5.15.tgz#87142957b1ae03749e99db287adb6eafc5e2980a"
-  integrity sha512-BsYwXhPZutRVxyyvCWYkSsw8rEoUTimFeH4GdA9u9gohfS+opVl56KjiBPpepHsaVjbnuL8932BD/47QdM5cZg==
+"@human-connection/styleguide@0.5.17":
+  version "0.5.17"
+  resolved "https://registry.yarnpkg.com/@human-connection/styleguide/-/styleguide-0.5.17.tgz#99816579616c8d5be6c66ee86c39cb6c4e694878"
+  integrity sha512-Qlo29eOi97lHls40Ms1hbGC29Aoz/W6BLoX/no5TQgHlP4qm+OK7Ra75g0sbj3a2x1Q4mZthUDWcqtjTYf6brw==
   dependencies:
     vue "^2.6.6"
 
@@ -11494,3 +11494,8 @@ zen-observable@^0.8.0:
   version "0.8.13"
   resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.13.tgz#a9f1b9dbdfd2d60a08761ceac6a861427d44ae2e"
   integrity sha512-fa+6aDUVvavYsefZw0zaZ/v3ckEtMgCFi30sn91SEZea4y/6jQp05E3omjkX91zV6RVdn15fqnFZ6RKjRGbp2g==
+
+zxcvbn@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/zxcvbn/-/zxcvbn-4.4.2.tgz#28ec17cf09743edcab056ddd8b1b06262cc73c30"
+  integrity sha1-KOwXzwl0PtyrBW3dixsGJizHPDA=