diff --git a/src/angular/services/auth-guard.service.ts b/src/angular/services/auth-guard.service.ts
index c388e2094c..1db4e5726c 100644
--- a/src/angular/services/auth-guard.service.ts
+++ b/src/angular/services/auth-guard.service.ts
@@ -20,8 +20,8 @@ export class AuthGuardService implements CanActivate {
             return false;
         }
 
-        const key = await this.cryptoService.getKey();
-        if (key == null) {
+        const hasKey = await this.cryptoService.hasKey();
+        if (!hasKey) {
             this.router.navigate(['lock']);
             return false;
         }
diff --git a/src/services/api.service.ts b/src/services/api.service.ts
index 7f581859f5..6c735530b4 100644
--- a/src/services/api.service.ts
+++ b/src/services/api.service.ts
@@ -60,8 +60,8 @@ export class ApiService implements ApiServiceAbstraction {
 
         /* tslint:disable */
         // Desktop
-        //this.baseUrl = 'http://localhost:4000';
-        //this.identityBaseUrl = 'http://localhost:33656';
+        this.baseUrl = 'http://localhost:4000';
+        this.identityBaseUrl = 'http://localhost:33656';
 
         // Desktop HTTPS
         //this.baseUrl = 'https://localhost:44377';
@@ -76,13 +76,15 @@ export class ApiService implements ApiServiceAbstraction {
         //this.identityBaseUrl = 'https://preview-identity.bitwarden.com';
 
         // Production
+        /*
         if (this.isWebClient) {
-            this.baseUrl = 'https://vault.bitwarden.com/api';
-            this.identityBaseUrl = 'https://vault.bitwarden.com/identity';
+            this.baseUrl = 'https://api.bitwarden.com';
+            this.identityBaseUrl = 'https://identity.bitwarden.com';
         } else {
             this.baseUrl = 'https://api.bitwarden.com';
             this.identityBaseUrl = 'https://identity.bitwarden.com';
         }
+        */
         /* tslint:enable */
     }
 
diff --git a/src/services/cipher.service.ts b/src/services/cipher.service.ts
index 6b60c0bd56..2544d4f1c4 100644
--- a/src/services/cipher.service.ts
+++ b/src/services/cipher.service.ts
@@ -179,8 +179,8 @@ export class CipherService implements CipherServiceAbstraction {
         }
 
         const decCiphers: CipherView[] = [];
-        const key = await this.cryptoService.getKey();
-        if (key == null) {
+        const hasKey = await this.cryptoService.hasKey();
+        if (!hasKey) {
             throw new Error('No key.');
         }
 
diff --git a/src/services/collection.service.ts b/src/services/collection.service.ts
index caca3c8920..02821bcba9 100644
--- a/src/services/collection.service.ts
+++ b/src/services/collection.service.ts
@@ -54,8 +54,8 @@ export class CollectionService implements CollectionServiceAbstraction {
             return this.decryptedCollectionCache;
         }
 
-        const key = await this.cryptoService.getKey();
-        if (key == null) {
+        const hasKey = await this.cryptoService.hasKey();
+        if (!hasKey) {
             throw new Error('No key.');
         }
 
diff --git a/src/services/folder.service.ts b/src/services/folder.service.ts
index f596941bb3..d4806e0c0f 100644
--- a/src/services/folder.service.ts
+++ b/src/services/folder.service.ts
@@ -67,8 +67,8 @@ export class FolderService implements FolderServiceAbstraction {
             return this.decryptedFolderCache;
         }
 
-        const key = await this.cryptoService.getKey();
-        if (key == null) {
+        const hasKey = await this.cryptoService.hasKey();
+        if (!hasKey) {
             throw new Error('No key.');
         }
 
diff --git a/src/services/lock.service.ts b/src/services/lock.service.ts
index 50e46c1420..bc744ce012 100644
--- a/src/services/lock.service.ts
+++ b/src/services/lock.service.ts
@@ -36,8 +36,8 @@ export class LockService implements LockServiceAbstraction {
             return;
         }
 
-        const key = await this.cryptoService.getKey();
-        if (key == null) {
+        const hasKey = await this.cryptoService.hasKey();
+        if (!hasKey) {
             // no key so no need to lock
             return;
         }
diff --git a/src/services/passwordGeneration.service.ts b/src/services/passwordGeneration.service.ts
index f39acb59cf..0e68c0c8f8 100644
--- a/src/services/passwordGeneration.service.ts
+++ b/src/services/passwordGeneration.service.ts
@@ -169,7 +169,7 @@ export class PasswordGenerationService implements PasswordGenerationServiceAbstr
     }
 
     async getHistory(): Promise<PasswordHistory[]> {
-        const hasKey = (await this.cryptoService.getKey()) != null;
+        const hasKey = await this.cryptoService.hasKey();
         if (!hasKey) {
             return new Array<PasswordHistory>();
         }
@@ -184,7 +184,7 @@ export class PasswordGenerationService implements PasswordGenerationServiceAbstr
 
     async addHistory(password: string): Promise<any> {
         // Cannot add new history if no key is available
-        const hasKey = (await this.cryptoService.getKey()) != null;
+        const hasKey = await this.cryptoService.hasKey();
         if (!hasKey) {
             return;
         }