diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index e309d5f16..2775e24fb 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -32,8 +32,8 @@ function AccountDetailScreen() {
 AccountDetailScreen.prototype.render = function() {
   var state = this.props
   var selected = state.address || Object.keys(state.accounts)[0]
-  var identity = state.identities[state.address]
-  var account = state.accounts[state.address]
+  var identity = state.identities[selected]
+  var account = state.accounts[selected]
   var accountDetail = state.accountDetail
   var transactions = state.transactions
 
diff --git a/ui/app/actions.js b/ui/app/actions.js
index 5e4a0d7da..5c5805c29 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -135,8 +135,8 @@ function recoverFromSeed(password, seed) {
       dispatch(this.hideLoadingIndication())
       if (err) return dispatch(this.displayWarning(err.message))
 
+      dispatch(this.goHome())
       dispatch(this.unlockMetamask())
-      dispatch(this.showAccountsPage())
    })
   }
 }