diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 60061dd7..b79d3855 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -234,15 +234,15 @@ const initApiPromise = (network: NetworkName, networkUrl: string) =>
                         };
                       }
 
-                      const isSecKeyAdded = identityStateData[did].secKeys.includes(encodeAddress(account, api.registry.chainSS58));
-                      const isMsKeyAdded = identityStateData[did].msKeys.includes(encodeAddress(account, api.registry.chainSS58));
+                      const isSecKeyAdded = identityStateData[did].secKeys.includes(encodeAddress(account));
+                      const isMsKeyAdded = identityStateData[did].msKeys.includes(encodeAddress(account));
 
                       if (isPrimary) {
-                        identityStateData[did].priKey = encodeAddress(account, api.registry.chainSS58);
+                        identityStateData[did].priKey = encodeAddress(account);
                       } else if (isSecondary && !isSecKeyAdded) {
-                        identityStateData[did].secKeys = [...identityStateData[did].secKeys, encodeAddress(account, api.registry.chainSS58)];
+                        identityStateData[did].secKeys = [...identityStateData[did].secKeys, encodeAddress(account)];
                       } else if (isMultiSig && !isMsKeyAdded) {
-                        identityStateData[did].msKeys = [...identityStateData[did].msKeys, encodeAddress(account, api.registry.chainSS58)];
+                        identityStateData[did].msKeys = [...identityStateData[did].msKeys, encodeAddress(account)];
                       }
 
                       const claimData = await api.query.identity.claims.entries(
diff --git a/packages/extension/src/migrations.ts b/packages/extension/src/migrations.ts
index 1daac6ed..972454d6 100644
--- a/packages/extension/src/migrations.ts
+++ b/packages/extension/src/migrations.ts
@@ -20,7 +20,7 @@ function isVersionEarlierOrEqual (version: string, compareTo: string): boolean {
   return true;
 }
 
-// Run the migration applicable to version 1.8.3 or earlier
+// Run the migration applicable to version 2.0.2 or earlier
 async function runMigrations () {
   const migrate = new AccountMigrations();
 
@@ -33,8 +33,8 @@ export async function checkForUpdateAndMigrate (details: chrome.runtime.Installe
   if (details.reason === chrome.runtime.OnInstalledReason.UPDATE) {
     const previousVersion = details.previousVersion;
 
-    // Migrate Account Prefixes. Runs when no lastVersion or a previous version of 1.8.3 or earlier
-    if (previousVersion && isVersionEarlierOrEqual(previousVersion, '1.8.3')) {
+    // Migrate Account Prefixes. Runs when no lastVersion or a previous version of 2.0.2 or earlier
+    if (previousVersion && isVersionEarlierOrEqual(previousVersion, '2.0.2')) {
       await runMigrations();
     }
   }