diff --git a/src/app/_services/keystore.service.ts b/src/app/_services/keystore.service.ts
index 6fcaa37..7d8b92e 100644
--- a/src/app/_services/keystore.service.ts
+++ b/src/app/_services/keystore.service.ts
@@ -10,11 +10,13 @@ export class KeystoreService {
   constructor() {}
 
   public static async getKeystore(): Promise<MutableKeyStore> {
-    if (!KeystoreService.mutableKeyStore) {
-      this.mutableKeyStore = new MutablePgpKeyStore();
-      await this.mutableKeyStore.loadKeyring();
-      return KeystoreService.mutableKeyStore;
-    }
-    return KeystoreService.mutableKeyStore;
+    return new Promise(async (resolve, reject) => {
+      if (!KeystoreService.mutableKeyStore) {
+        this.mutableKeyStore = new MutablePgpKeyStore();
+        await this.mutableKeyStore.loadKeyring();
+        return resolve(KeystoreService.mutableKeyStore);
+      }
+      return resolve(KeystoreService.mutableKeyStore);
+    });
   }
 }
diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts
index 978f71f..cde24f3 100644
--- a/src/environments/environment.dev.ts
+++ b/src/environments/environment.dev.ts
@@ -6,7 +6,7 @@ export const environment = {
   logLevel: NgxLoggerLevel.ERROR,
   serverLogLevel: NgxLoggerLevel.OFF,
   loggingUrl: '',
-  cicMetaUrl: 'https://meta.dev.grassrootseconomics.net',
+  cicMetaUrl: 'https://meta-auth.dev.grassrootseconomics.net',
   publicKeysUrl: 'https://dev.grassrootseconomics.net/.well-known/publickeys/',
   cicCacheUrl: 'https://cache.dev.grassrootseconomics.net',
   web3Provider: 'wss://bloxberg-ws.dev.grassrootseconomics.net',
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index f4786c1..32cc50b 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -6,7 +6,7 @@ export const environment = {
   logLevel: NgxLoggerLevel.ERROR,
   serverLogLevel: NgxLoggerLevel.OFF,
   loggingUrl: '',
-  cicMetaUrl: 'https://meta.dev.grassrootseconomics.net',
+  cicMetaUrl: 'https://meta-auth.dev.grassrootseconomics.net',
   publicKeysUrl: 'https://dev.grassrootseconomics.net/.well-known/publickeys/',
   cicCacheUrl: 'https://cache.dev.grassrootseconomics.net',
   web3Provider: 'wss://bloxberg-ws.dev.grassrootseconomics.net',
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index df02af7..f2d7c4f 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -6,7 +6,7 @@ export const environment = {
   logLevel: NgxLoggerLevel.ERROR,
   serverLogLevel: NgxLoggerLevel.OFF,
   loggingUrl: 'http://localhost:8000',
-  cicMetaUrl: 'https://meta.dev.grassrootseconomics.net',
+  cicMetaUrl: 'https://meta-auth.dev.grassrootseconomics.net',
   publicKeysUrl: 'https://dev.grassrootseconomics.net/.well-known/publickeys/',
   cicCacheUrl: 'https://cache.dev.grassrootseconomics.net',
   web3Provider: 'wss://bloxberg-ws.dev.grassrootseconomics.net',