From ed1917d71a464c5cf12d3dc283fcc30976134db8 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 2 Nov 2016 16:18:47 -0700
Subject: [PATCH] Fix initial vault creation

---
 app/scripts/keyring-controller.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 1b9739b9c..f0fb0ad65 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -122,6 +122,7 @@ module.exports = class KeyringController extends EventEmitter {
     return this.loadKey(password)
     .then((derivedKey) => {
       key = derivedKey
+      this.key = key
       return this.idStoreMigrator.oldSeedForPassword(password)
     })
     .then((serialized) => {
@@ -144,10 +145,13 @@ module.exports = class KeyringController extends EventEmitter {
     const salt = this.encryptor.generateSalt()
     configManager.setSalt(salt)
 
-    return new Promise((res, rej) => {
-      this.createFirstKeyTree(password, (err, state) => {
-        if (err) return rej(err)
-        res(configManager.getVault())
+    return this.migrateAndGetKey(password)
+    .then((key) => {
+      return new Promise((res, rej) => {
+        this.createFirstKeyTree(password, (err, state) => {
+          if (err) return rej(err)
+          res(configManager.getVault())
+        })
       })
     })
     .then((encryptedString) => {