diff --git a/jslib b/jslib
index da132217da..ed8d39ed85 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit da132217da553365538bbb66a21c40d3966610c1
+Subproject commit ed8d39ed85fee7e00520618f0bb831a87438b610
diff --git a/src/app/accounts/lock.component.ts b/src/app/accounts/lock.component.ts
index c59ccef915..a63bf5191e 100644
--- a/src/app/accounts/lock.component.ts
+++ b/src/app/accounts/lock.component.ts
@@ -24,7 +24,7 @@ import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
 
 import { LockComponent as BaseLockComponent } from 'jslib-angular/components/lock.component';
 
-import { ElectronConstants } from 'jslib-electron/electronConstants';
+import { ConstantsService } from 'jslib-common/services/constants.service';
 
 const BroadcasterSubscriptionId = 'LockComponent';
 
@@ -48,7 +48,7 @@ export class LockComponent extends BaseLockComponent implements OnDestroy {
 
     async ngOnInit() {
         await super.ngOnInit();
-        const autoPromptBiometric = !await this.storageService.get<boolean>(ElectronConstants.noAutoPromptBiometrics);
+        const autoPromptBiometric = !await this.storageService.get<boolean>(ConstantsService.disableAutoBiometricsPromptKey);
 
         this.route.queryParams.subscribe(params => {
             if (this.supportsBiometric && params.promptBiometric && autoPromptBiometric) {
diff --git a/src/app/accounts/settings.component.ts b/src/app/accounts/settings.component.ts
index 93305726b3..b4c5bbe155 100644
--- a/src/app/accounts/settings.component.ts
+++ b/src/app/accounts/settings.component.ts
@@ -172,7 +172,7 @@ export class SettingsComponent implements OnInit {
         this.supportsBiometric = await this.platformUtilsService.supportsBiometric();
         this.biometric = await this.vaultTimeoutService.isBiometricLockSet();
         this.biometricText = await this.storageService.get<string>(ConstantsService.biometricText);
-        this.noAutoPromptBiometrics = await this.storageService.get<boolean>(ElectronConstants.noAutoPromptBiometrics);
+        this.noAutoPromptBiometrics = await this.storageService.get<boolean>(ConstantsService.disableAutoBiometricsPromptKey);
         this.noAutoPromptBiometricsText = await this.storageService.get<string>(ElectronConstants.noAutoPromptBiometricsText);
         this.alwaysShowDock = await this.storageService.get<boolean>(ElectronConstants.alwaysShowDock);
         this.showAlwaysShowDock = this.platformUtilsService.getDevice() === DeviceType.MacOsDesktop;
@@ -235,7 +235,7 @@ export class SettingsComponent implements OnInit {
             await this.storageService.save(ConstantsService.biometricUnlockKey, true);
         } else {
             await this.storageService.remove(ConstantsService.biometricUnlockKey);
-            await this.storageService.remove(ElectronConstants.noAutoPromptBiometrics);
+            await this.storageService.remove(ConstantsService.disableAutoBiometricsPromptKey);
             this.noAutoPromptBiometrics = false;
         }
         this.vaultTimeoutService.biometricLocked = false;
@@ -248,9 +248,9 @@ export class SettingsComponent implements OnInit {
         }
 
         if (this.noAutoPromptBiometrics) {
-            await this.storageService.save(ElectronConstants.noAutoPromptBiometrics, true);
+            await this.storageService.save(ConstantsService.disableAutoBiometricsPromptKey, true);
         } else {
-            await this.storageService.remove(ElectronConstants.noAutoPromptBiometrics);
+            await this.storageService.remove(ConstantsService.disableAutoBiometricsPromptKey);
         }
     }
 
diff --git a/src/services/nativeMessaging.service.ts b/src/services/nativeMessaging.service.ts
index 117c1be67c..58a1dd3826 100644
--- a/src/services/nativeMessaging.service.ts
+++ b/src/services/nativeMessaging.service.ts
@@ -7,10 +7,10 @@ import { I18nService } from 'jslib-common/abstractions/i18n.service';
 import { LogService } from 'jslib-common/abstractions/log.service';
 import { MessagingService } from 'jslib-common/abstractions/messaging.service';
 import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
+import { StorageService } from 'jslib-common/abstractions/storage.service';
 import { UserService } from 'jslib-common/abstractions/user.service';
 import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.service';
 
-import { StorageService } from 'jslib-common/abstractions';
 import { Utils } from 'jslib-common/misc/utils';
 import { SymmetricCryptoKey } from 'jslib-common/models/domain/symmetricCryptoKey';
 import { ElectronConstants } from 'jslib-electron/electronConstants';