diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 280b332a0..8ceb2b1ce 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -186,7 +186,7 @@ module.exports = class KeyringController extends EventEmitter {
       this.keyrings = keyrings
       this.setupAccounts()
       this.emit('update')
-      cb()
+      cb(null, this.getState())
     })
     .catch((err) => {
       console.error(err)
diff --git a/ui/app/actions.js b/ui/app/actions.js
index 12ba8fffa..e69b743e9 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -161,7 +161,7 @@ function tryUnlockMetamask (password) {
   return (dispatch) => {
     dispatch(actions.showLoadingIndication())
     dispatch(actions.unlockInProgress())
-    background.submitPassword(password, (err) => {
+    background.submitPassword(password, (err, newState) => {
       dispatch(actions.hideLoadingIndication())
       if (err) {
         dispatch(actions.unlockFailed(err.message))