1 files changed, 12 insertions, 1 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index a742f3cba..2a45e413b 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -336,7 +336,7 @@ module.exports = class MetamaskController extends EventEmitter {
 
       // KeyringController
       setLocked: nodeify(keyringController.setLocked, keyringController),
-      createNewVaultAndKeychain: nodeify(keyringController.createNewVaultAndKeychain, keyringController),
+      createNewVaultAndKeychain: this.createNewVaultAndKeychain.bind(this),
       createNewVaultAndRestore: nodeify(keyringController.createNewVaultAndRestore, keyringController),
       addNewKeyring: nodeify(keyringController.addNewKeyring, keyringController),
       saveAccountLabel: nodeify(keyringController.saveAccountLabel, keyringController),
@@ -458,6 +458,17 @@ module.exports = class MetamaskController extends EventEmitter {
   // Vault Management
   //
 
+  createNewVaultAndKeychain (password, cb) {
+    this.keyringController.createNewVaultAndKeychain(password)
+    .then((vault) => {
+      const { identities } = vault
+      const address = Object.keys(identities)[0]
+      this.preferencesController.setSelectedAddress(address)
+      cb(null, vault)
+    })
+    .catch(reason => cb(reason))
+  }
+
   submitPassword (password, cb) {
     return this.keyringController.submitPassword(password)
     .then((newState) => { cb(null, newState) })