diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js
index 1126b83e7..4160466e1 100644
--- a/app/scripts/lib/idStore.js
+++ b/app/scripts/lib/idStore.js
@@ -449,7 +449,7 @@ IdentityStore.prototype.tryPassword = function (password, cb) {
     const isCorrect = keyStore.isDerivedKeyCorrect(pwDerivedKey)
     if (!isCorrect) return cb(new Error('Lightwallet - password incorrect'))
 
-    this._createIdMgmt(derivedKey)
+    this._createIdMgmt(pwDerivedKey)
     cb()
   })
 }
@@ -487,7 +487,7 @@ IdentityStore.prototype._createVault = function (password, seedPhrase, entropy,
 
 IdentityStore.prototype._createIdMgmt = function (derivedKey) {
   this._idmgmt = new IdManagement({
-    keyStore: this.keyStore,
+    keyStore: this._keyStore,
     derivedKey: derivedKey,
     configManager: this.configManager,
   })
diff --git a/test/unit/idStore-test.js b/test/unit/idStore-test.js
index ac416e5cd..03b1d3b41 100644
--- a/test/unit/idStore-test.js
+++ b/test/unit/idStore-test.js
@@ -109,7 +109,7 @@ describe('IdentityStore', function() {
     })
 
     it('should enforce seed compliance with TestRPC', function (done) {
-      this.timeout(5000)
+      this.timeout(10000)
       const tests = assertions.map((assertion) => {
         return function (cb) {
           accounts = []
@@ -122,7 +122,7 @@ describe('IdentityStore', function() {
 
             idStore.tryPassword(password, function (err) {
 
-              assert.ok(idStore.isUnlocked(), 'should unlock the id store')
+              assert.ok(idStore._isUnlocked(), 'should unlock the id store')
 
               idStore.submitPassword(password, function(err, account) {
                 assert.ifError(err)