From 6763871c416001e19c224b90a99ed7d9ece69158 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Sat, 10 Sep 2016 11:46:50 -0700
Subject: [PATCH] Captured #640 in failing test

---
 app/scripts/lib/idStore.js |  5 +++++
 test/unit/idStore-test.js  | 13 ++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js
index 9f4961b0b..d2d37b0f4 100644
--- a/app/scripts/lib/idStore.js
+++ b/app/scripts/lib/idStore.js
@@ -464,6 +464,11 @@ IdentityStore.prototype._createIdmgmt = function (password, seedPhrase, entropy,
     keyStore.keyFromPassword(password, (err, derivedKey) => {
       if (err) return cb(err)
 
+      this._ethStore._currentState = {
+        accounts: {},
+        transactions: {},
+      }
+
       keyStore.addHdDerivationPath(this.hdPathString, derivedKey, {curve: 'secp256k1', purpose: 'sign'})
 
       this._createFirstWallet(derivedKey)
diff --git a/test/unit/idStore-test.js b/test/unit/idStore-test.js
index cbbec43b5..3d28ddf90 100644
--- a/test/unit/idStore-test.js
+++ b/test/unit/idStore-test.js
@@ -83,8 +83,19 @@ describe('IdentityStore', function() {
         assert.ifError(err)
 
         let newKeystore = idStore._idmgmt.keyStore
+
         assert.equal(accounts[0], firstAccount)
-        done()
+
+        accounts = []
+        const secondSeed = 'radar blur cabbage chef fix engine embark joy scheme fiction master release'
+        const secondAcct = '0xac39b311dceb2a4b2f5d8461c1cdaf756f4f7ae9'
+
+        idStore.recoverFromSeed(password, secondSeed, (err) => {
+
+          let accounts = idStore._getAddresses()
+          assert.equal(accounts[0], secondAcct)
+          done()
+        })
       })
     })
   })