diff --git a/e2e/full/user-profile/change-password.e2e.js b/e2e/full/user-profile/change-password.e2e.js
index 5c2d41a6..813b61f1 100644
--- a/e2e/full/user-profile/change-password.e2e.js
+++ b/e2e/full/user-profile/change-password.e2e.js
@@ -9,12 +9,17 @@ var expect = chai.expect;
 describe('change password', function() {
     before(async function(){
         browser.get('http://localhost:9001/user-settings/user-change-password');
-
         await utils.common.waitLoader();
 
         utils.common.takeScreenshot('edit-user-profile', 'change-password');
     });
 
+    beforeEach(async function() {
+        browser.get('http://localhost:9001/user-settings/user-change-password');
+
+        await utils.common.waitLoader();
+    });
+
     it('retype different', async function() {
         await $('#current-password').sendKeys('123123');
         await $('#new-password').sendKeys('123456');
@@ -43,6 +48,11 @@ describe('change password', function() {
         $('button[type="submit"]').click();
 
         expect(utils.notifications.success.open()).to.be.eventually.equal(true);
+    });
+
+    after(async function() {
+        browser.get('http://localhost:9001/user-settings/user-change-password');
+        await utils.common.waitLoader();
 
         //restore
         await $('#current-password').sendKeys('aaabbb');
@@ -50,5 +60,7 @@ describe('change password', function() {
         await $('#retype-password').sendKeys('123123');
 
         $('button[type="submit"]').click();
-    });
+
+        await browser.waitForAngular();
+    })
 });