diff --git a/src/views/IdentitySwitcherView.vue b/src/views/IdentitySwitcherView.vue
index 8a1d3e8c..aaa3db3c 100644
--- a/src/views/IdentitySwitcherView.vue
+++ b/src/views/IdentitySwitcherView.vue
@@ -25,12 +25,15 @@
     <ul class="mb-4">
       <li
         class="block bg-slate-100 rounded-md flex items-center px-4 py-3 mb-2"
+        v-for="ident in otherIdentities"
+        :key="ident.did"
+        @click="switchAccount(ident.did)"
       >
         <fa icon="circle" class="fa-fw text-slate-400 text-xl mr-3"></fa>
         <span class="overflow-hidden">
-          <h2 class="text-xl font-semibold mb-0">Givenname Surname</h2>
+          <h2 class="text-xl font-semibold mb-0"></h2>
           <div class="text-sm text-slate-500 truncate">
-            <b>ID:</b> <code>did:peer:lk451kl3kl45kj41</code>
+            <b>ID:</b> <code>{{ ident.did }}</code>
           </div>
         </span>
       </li>
@@ -44,8 +47,9 @@
       Add Another Identity&hellip;
     </router-link>
     <a
-      href="start.html"
+      href="#"
       class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-8"
+      @click="switchAccount('0')"
     >
       No Identity
     </a>
@@ -68,10 +72,23 @@ import QuickNav from "@/components/QuickNav";
 @Component({ components: { AlertMessage, QuickNav } })
 export default class IdentitySwitcherView extends Vue {
   Constants = AppString;
-  private accounts: AccountsSchema;
+  public accounts: AccountsSchema;
   public activeDid;
   public firstName;
   public lastName;
+  public alertTitle;
+  public alertMessage;
+  public otherIdentities = [];
+
+  public async getIdentity(activeDid) {
+    await accountsDB.open();
+    const account = await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first();
+    const identity = JSON.parse(account?.identity || "null");
+    return identity;
+  }
 
   async created() {
     try {
@@ -86,14 +103,19 @@ export default class IdentitySwitcherView extends Vue {
 
       const identity = await this.getIdentity(this.activeDid);
 
-      this.publicHex = identity.keys[0].publicKeyHex;
-      this.publicBase64 = Buffer.from(this.publicHex, "hex").toString("base64");
-      this.derivationPath = identity.keys[0].meta.derivationPath;
-
-      db.settings.update(MASTER_SETTINGS_KEY, {
-        activeDid: identity.did,
-      });
-      this.checkLimits();
+      if (identity) {
+        db.settings.update(MASTER_SETTINGS_KEY, {
+          activeDid: identity.did,
+        });
+      }
+      await accountsDB.open();
+      const accounts = await accountsDB.accounts.toArray();
+      for (let n = 0; n < accounts.length; n++) {
+        const did = JSON.parse(accounts[n].identity)["did"];
+        if (did && this.activeDid !== did) {
+          this.otherIdentities.push({ did: did });
+        }
+      }
     } catch (err) {
       if (
         err.message ===
@@ -113,31 +135,24 @@ export default class IdentitySwitcherView extends Vue {
     }
   }
 
-  async switchAccount(accountNum: number) {
+  async switchAccount(did: string) {
     // 0 means none
-    if (accountNum === 0) {
-      await db.open();
-      db.settings.update(MASTER_SETTINGS_KEY, {
-        activeDid: undefined,
-      });
-      this.activeDid = "";
-      this.derivationPath = "";
-      this.publicHex = "";
-      this.publicBase64 = "";
-    } else {
-      await accountsDB.open();
-      const accounts = await accountsDB.accounts.toArray();
-      const account = accounts[accountNum - 1];
-
-      await db.open();
-      db.settings.update(MASTER_SETTINGS_KEY, {
-        activeDid: account.did,
-      });
-
-      this.activeDid = account.did;
-      this.derivationPath = account.derivationPath;
-      this.publicHex = account.publicKeyHex;
-      this.publicBase64 = Buffer.from(this.publicHex, "hex").toString("base64");
+    if (did === "0") {
+      did = undefined;
+    }
+    await db.open();
+    db.settings.update(MASTER_SETTINGS_KEY, {
+      activeDid: did,
+    });
+    this.activeDid = did;
+    this.otherIdentities = [];
+    await accountsDB.open();
+    const accounts = await accountsDB.accounts.toArray();
+    for (let n = 0; n < accounts.length; n++) {
+      const did = JSON.parse(accounts[n].identity)["did"];
+      if (did && this.activeDid !== did) {
+        this.otherIdentities.push({ did: did });
+      }
     }
   }
 }