diff --git a/src/components/Modals/ImportKey/index.tsx b/src/components/Modals/ImportKey/index.tsx
index f9de790..4ad0a85 100644
--- a/src/components/Modals/ImportKey/index.tsx
+++ b/src/components/Modals/ImportKey/index.tsx
@@ -34,13 +34,23 @@ export const ImportKeyModal = ({
       toastError("You don't have an identity yet.");
       return;
     }
+    let key = identityKey;
+    if (key.startsWith("identityNo:")) {
+      const indexOfSeparator = key.indexOf(';');
+      key = key.substring(indexOfSeparator + 1);
+    }
     confirm({
       description:
         'This operation updates the identity key and you might lose access to your addresses.',
     }).then(() => {
-      KeyStore.updateIdentityKey(identityNo, identityKey);
-      toastSuccess('Successfully imported identity key.');
-      onClose();
+      try {
+        KeyStore.updateIdentityKey(identityNo, key);
+        toastSuccess('Successfully imported identity key.');
+      } catch (e) {
+        toastError("Invalid identity key");
+      } finally {
+        onClose();
+      }
     });
   };
 
diff --git a/src/components/Modals/ShareIdentity/index.tsx b/src/components/Modals/ShareIdentity/index.tsx
index 458e7b3..9517c03 100644
--- a/src/components/Modals/ShareIdentity/index.tsx
+++ b/src/components/Modals/ShareIdentity/index.tsx
@@ -47,7 +47,7 @@ export const ShareIdentityModal = ({
 
     try {
       const sharedKey = IdentityKey.getSharedKey(identityKey, selectedChains);
-      setSharedKey(sharedKey);
+      setSharedKey(`identityNo:${identityNo};`.concat(sharedKey));
     } catch (e: any) {
       toastError(`Failed to get the identity key. Error: ${e.message}`);
     }
@@ -62,17 +62,6 @@ export const ShareIdentityModal = ({
       <Box className='modal-wrapper'>
         <DialogTitle>Share Identity</DialogTitle>
         <DialogContent>
-          <Box className={styles.identityNo}>
-            <Typography>{`Identity No: ${identityNo}`}</Typography>
-            <CopyToClipboard
-              text={identityNo.toString()}
-              onCopy={() => toastSuccess('Identity no copied to clipboard.')}
-            >
-              <IconButton>
-                <ContentCopyIcon />
-              </IconButton>
-            </CopyToClipboard>
-          </Box>
           <Typography mt='2em'>
             Specify the chains that the receiver of the identity key will be
             able to access:
@@ -110,9 +99,7 @@ export const ShareIdentityModal = ({
             </CopyToClipboard>
           </Box>
           <Typography color='primary' align='center'>
-            {'This identity key has to be sent alongside the identity no.'}
-            <br />
-            {"Without it, the receiver won't have access to your addresses"}
+            {'This identity key will be sent alongside the identity no.'}
           </Typography>
           <Button
             className='btn-ok'
diff --git a/src/consts/index.ts b/src/consts/index.ts
index 50f1cbe..8cb52b8 100644
--- a/src/consts/index.ts
+++ b/src/consts/index.ts
@@ -1,7 +1,7 @@
 export type RELAY_CHAIN_OPTION = 'polkadot' | 'kusama';
 const RELAY_CHAIN_ENDPOINTS = {
-  polkadot: "wss://polkadot.api.onfinality.io/public-ws",
-  kusama: "wss://kusama.api.onfinality.io/public-ws"
+  polkadot: "wss://rpc.polkadot.io",
+  kusama: "wss://kusama-rpc.polkadot.io"
 };
 export const RELAY_CHAIN = (process.env.RELAY_CHAIN || 'polkadot') as RELAY_CHAIN_OPTION;
 export const RELAY_CHAIN_ENDPOINT = RELAY_CHAIN_ENDPOINTS[RELAY_CHAIN];
diff --git a/src/pages/transfer.tsx b/src/pages/transfer.tsx
index 6142a9e..bf4d13d 100644
--- a/src/pages/transfer.tsx
+++ b/src/pages/transfer.tsx
@@ -196,7 +196,8 @@ const TransferPage = () => {
       return true;
     }
 
-    const isSourceParachain = sourceChainId > 0;
+    // Even if it is we want to get the perspective from the relay chain.
+    const isSourceParachain = false;
 
     if (
       sourceChainId !== destChainId &&
@@ -430,11 +431,15 @@ const TransferPage = () => {
               value={recipientId === undefined ? '' : recipientId}
               onChange={(e) => setRecipientId(Number(e.target.value))}
             >
-              {identities.map((identity, index) => (
-                <MenuItem value={index} key={index}>
-                  {identity.nickName}
-                </MenuItem>
-              ))}
+              {identities.filter(
+                (identity) =>
+                  IdentityKey.containsChainId(
+                    KeyStore.readIdentityKey(identity.identityNo) || '', destChainId
+                  )).map((identity, index) => (
+                    <MenuItem value={index} key={index}>
+                      {identity.nickName}
+                    </MenuItem>
+                  ))}
             </Select>
           </FormControl>
         )}
diff --git a/src/utils/identityKey.ts b/src/utils/identityKey.ts
index 6803771..8ef3585 100644
--- a/src/utils/identityKey.ts
+++ b/src/utils/identityKey.ts
@@ -2,6 +2,46 @@ import aesjs from "aes-js";
 import crypto from "crypto";
 
 class IdentityKey {
+  public static sanityCheck(identityKey: string): boolean {
+    let key = identityKey;
+
+    const separatorIndex = key.indexOf(';')
+    if (separatorIndex === -1) {
+      return false;
+    }
+
+    if (key.startsWith("identityNo:")) {
+      if (key.length === separatorIndex + 1) {
+        return true;
+      }
+      key = key.substring(separatorIndex + 1);
+    }
+
+    let result = true;
+
+    while (result) {
+      const separatorIndex = key.indexOf(';')
+      if (separatorIndex === -1) {
+        break;
+      }
+      const colonIndex = key.indexOf(':');
+      if (colonIndex === -1) {
+        result = false;
+        break;
+      }
+
+      const cipher = Buffer.from(key.substring(colonIndex + 1, separatorIndex - 1), "base64");
+      if (cipher.length !== 16) {
+        result = false;
+        break;
+      }
+
+      key = key.substring(separatorIndex + 1);
+    }
+
+    return result;
+  }
+
   public static newCipher(identityKey: string, chainId: number): string {
     const regexPattern = new RegExp(`\\b${chainId}:`, "g");
     if (regexPattern.test(identityKey)) {
@@ -55,21 +95,22 @@ class IdentityKey {
 
     if (startIndex >= 0) {
       const endIndex = identityKey.indexOf(";", startIndex);
-      return identityKey.substring(startIndex + chainId.toString().length + 1, endIndex - 1);
+      return identityKey.substring(startIndex + chainId.toString().length + 1, endIndex);
     } else {
       throw new Error("Cannot find chainId");
     }
   }
 
   public static getSharedKey(identityKey: string, selectedChains: number[]): string {
+    let key = JSON.parse(JSON.stringify(identityKey));
     let sharedKey = "";
     selectedChains.forEach((chainId) => {
-      if (!IdentityKey.containsChainId(identityKey, chainId)) {
-        identityKey = IdentityKey.newCipher(identityKey, chainId);
+      if (!IdentityKey.containsChainId(key, chainId)) {
+        key = IdentityKey.newCipher(key, chainId);
         throw new Error(`Cipher for chain #${chainId} not found`);
       }
       sharedKey += `${chainId}:${IdentityKey.getChainCipher(
-        identityKey,
+        key,
         chainId
       )};`;
     });
diff --git a/src/utils/keyStore.ts b/src/utils/keyStore.ts
index 2523d11..07f62cc 100644
--- a/src/utils/keyStore.ts
+++ b/src/utils/keyStore.ts
@@ -1,3 +1,5 @@
+import IdentityKey from "./identityKey";
+
 const LS_KEY_STORE = 'dotflow-key-store';
 
 interface IKeyStore {
@@ -21,6 +23,12 @@ class KeyStore {
   }
 
   public static updateKeyStore(ks: IKeyStore) {
+    for (const key in ks) {
+      if (!IdentityKey.sanityCheck(JSON.parse(JSON.stringify(ks[key])))) {
+        throw new Error("The identity key is invalid");
+      }
+    }
+
     localStorage.setItem(LS_KEY_STORE, JSON.stringify(ks));
   }