diff --git a/jslib b/jslib
index 5d874d07b3..6ab444a986 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 5d874d07b35a23dc6d54f1f435d88d2ddd815e33
+Subproject commit 6ab444a9868c32ac53761f9d233d816744da9a1d
diff --git a/src/app/accounts/set-password.component.ts b/src/app/accounts/set-password.component.ts
index 9598114d21..04c94fcf51 100644
--- a/src/app/accounts/set-password.component.ts
+++ b/src/app/accounts/set-password.component.ts
@@ -1,19 +1,13 @@
 import { Component } from '@angular/core';
-import {
-    ActivatedRoute,
-    Router,
-} from '@angular/router';
+import { Router } from '@angular/router';
 
 import { ApiService } from 'jslib/abstractions/api.service';
-import { CipherService } from 'jslib/abstractions/cipher.service';
 import { CryptoService } from 'jslib/abstractions/crypto.service';
-import { FolderService } from 'jslib/abstractions/folder.service';
 import { I18nService } from 'jslib/abstractions/i18n.service';
 import { MessagingService } from 'jslib/abstractions/messaging.service';
 import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service';
 import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
 import { PolicyService } from 'jslib/abstractions/policy.service';
-import { SyncService } from 'jslib/abstractions/sync.service';
 import { UserService } from 'jslib/abstractions/user.service';
 
 import {
@@ -28,10 +22,8 @@ export class SetPasswordComponent extends BaseSetPasswordComponent {
     constructor(apiService: ApiService, i18nService: I18nService,
         cryptoService: CryptoService, messagingService: MessagingService,
         userService: UserService, passwordGenerationService: PasswordGenerationService,
-        platformUtilsService: PlatformUtilsService, folderService: FolderService,
-        cipherService: CipherService, syncService: SyncService,
-        policyService: PolicyService, router: Router, route: ActivatedRoute) {
-        super(apiService, i18nService, cryptoService, messagingService, userService, passwordGenerationService,
-            platformUtilsService, folderService, cipherService, syncService, policyService, router, route);
+        platformUtilsService: PlatformUtilsService, policyService: PolicyService, router: Router) {
+        super(i18nService, cryptoService, messagingService, userService, passwordGenerationService,
+            platformUtilsService, policyService, router, apiService);
     }
 }
diff --git a/src/app/settings/change-password.component.ts b/src/app/settings/change-password.component.ts
index d6355d2dbf..b61a5dc588 100644
--- a/src/app/settings/change-password.component.ts
+++ b/src/app/settings/change-password.component.ts
@@ -1,7 +1,5 @@
 import { Component } from '@angular/core';
 
-import { Router } from '@angular/router';
-
 import { ApiService } from 'jslib/abstractions/api.service';
 import { CipherService } from 'jslib/abstractions/cipher.service';
 import { CryptoService } from 'jslib/abstractions/crypto.service';
@@ -34,14 +32,14 @@ export class ChangePasswordComponent extends BaseChangePasswordComponent {
     rotateEncKey = false;
     currentMasterPassword: string;
 
-    constructor(apiService: ApiService, i18nService: I18nService,
+    constructor(i18nService: I18nService,
         cryptoService: CryptoService, messagingService: MessagingService,
         userService: UserService, passwordGenerationService: PasswordGenerationService,
-        platformUtilsService: PlatformUtilsService, folderService: FolderService,
-        cipherService: CipherService, syncService: SyncService,
-        policyService: PolicyService, router: Router) {
-        super(apiService, i18nService, cryptoService, messagingService, userService, passwordGenerationService,
-            platformUtilsService, folderService, cipherService, syncService, policyService, router);
+        platformUtilsService: PlatformUtilsService, policyService: PolicyService,
+        private folderService: FolderService, private cipherService: CipherService,
+        private syncService: SyncService, private apiService: ApiService, ) {
+        super(i18nService, cryptoService, messagingService, userService, passwordGenerationService,
+            platformUtilsService, policyService);
     }
 
     async rotateEncKeyClicked() {