diff --git a/jslib b/jslib
index 3238b81926..2aa71f98a1 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 3238b819268d2155376a22b963887f59a3eeb7ca
+Subproject commit 2aa71f98a1f623470b3bd71306e0ef8a1ba97758
diff --git a/src/app/accounts/lock.component.ts b/src/app/accounts/lock.component.ts
index f5caec9d25..029da32103 100644
--- a/src/app/accounts/lock.component.ts
+++ b/src/app/accounts/lock.component.ts
@@ -7,6 +7,7 @@ import { I18nService } from 'jslib/abstractions/i18n.service';
 import { LockService } from 'jslib/abstractions/lock.service';
 import { MessagingService } from 'jslib/abstractions/messaging.service';
 import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
+import { StateService } from 'jslib/abstractions/state.service';
 import { StorageService } from 'jslib/abstractions/storage.service';
 import { UserService } from 'jslib/abstractions/user.service';
 
@@ -23,9 +24,10 @@ export class LockComponent extends BaseLockComponent {
         platformUtilsService: PlatformUtilsService, messagingService: MessagingService,
         userService: UserService, cryptoService: CryptoService,
         storageService: StorageService, lockService: LockService,
-         environmentService: EnvironmentService, private routerService: RouterService) {
+        environmentService: EnvironmentService, private routerService: RouterService,
+        stateService: StateService) {
         super(router, i18nService, platformUtilsService, messagingService, userService, cryptoService,
-            storageService, lockService, environmentService);
+            storageService, lockService, environmentService, stateService);
     }
 
     async ngOnInit() {
diff --git a/src/app/accounts/login.component.ts b/src/app/accounts/login.component.ts
index eb13bab842..95c64296f2 100644
--- a/src/app/accounts/login.component.ts
+++ b/src/app/accounts/login.component.ts
@@ -19,9 +19,9 @@ import { LoginComponent as BaseLoginComponent } from 'jslib/angular/components/l
 export class LoginComponent extends BaseLoginComponent {
     constructor(authService: AuthService, router: Router,
         i18nService: I18nService, private route: ActivatedRoute,
-        storageService: StorageService, private stateService: StateService,
+        storageService: StorageService, stateService: StateService,
         platformUtilsService: PlatformUtilsService) {
-        super(authService, router, platformUtilsService, i18nService, storageService);
+        super(authService, router, platformUtilsService, i18nService, storageService, stateService);
         this.onSuccessfulLoginNavigate = this.goAfterLogIn;
     }
 
diff --git a/src/app/accounts/two-factor.component.ts b/src/app/accounts/two-factor.component.ts
index 8cb5aa53d7..87d4e43f41 100644
--- a/src/app/accounts/two-factor.component.ts
+++ b/src/app/accounts/two-factor.component.ts
@@ -19,6 +19,7 @@ import { EnvironmentService } from 'jslib/abstractions/environment.service';
 import { I18nService } from 'jslib/abstractions/i18n.service';
 import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
 import { StateService } from 'jslib/abstractions/state.service';
+import { StorageService } from 'jslib/abstractions/storage.service';
 
 import { TwoFactorComponent as BaseTwoFactorComponent } from 'jslib/angular/components/two-factor.component';
 
@@ -31,9 +32,11 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
 
     constructor(authService: AuthService, router: Router,
         i18nService: I18nService, apiService: ApiService,
-        platformUtilsService: PlatformUtilsService, private stateService: StateService,
-        environmentService: EnvironmentService, private componentFactoryResolver: ComponentFactoryResolver) {
-        super(authService, router, i18nService, apiService, platformUtilsService, window, environmentService);
+        platformUtilsService: PlatformUtilsService, stateService: StateService,
+        environmentService: EnvironmentService, private componentFactoryResolver: ComponentFactoryResolver,
+        storageService: StorageService) {
+        super(authService, router, i18nService, apiService, platformUtilsService, window, environmentService,
+            stateService, storageService);
         this.onSuccessfulLoginNavigate = this.goAfterLogIn;
     }
 
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 711300da10..99d4756b6c 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -41,6 +41,7 @@ import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration
 import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
 import { SearchService } from 'jslib/abstractions/search.service';
 import { SettingsService } from 'jslib/abstractions/settings.service';
+import { StateService } from 'jslib/abstractions/state.service';
 import { SyncService } from 'jslib/abstractions/sync.service';
 import { TokenService } from 'jslib/abstractions/token.service';
 import { UserService } from 'jslib/abstractions/user.service';
@@ -81,7 +82,8 @@ export class AppComponent implements OnDestroy, OnInit {
         private lockService: LockService, private storageService: StorageService,
         private cryptoService: CryptoService, private collectionService: CollectionService,
         private sanitizer: DomSanitizer, private searchService: SearchService,
-        private notificationsService: NotificationsService, private routerService: RouterService) { }
+        private notificationsService: NotificationsService, private routerService: RouterService,
+        private stateService: StateService) { }
 
     ngOnInit() {
         this.ngZone.runOutsideAngular(() => {
@@ -183,6 +185,7 @@ export class AppComponent implements OnDestroy, OnInit {
             this.folderService.clear(userId),
             this.collectionService.clear(userId),
             this.passwordGenerationService.clear(),
+            this.stateService.purge(),
         ]);
 
         this.searchService.clearIndex();