diff --git a/js/controllers/home.js b/js/controllers/home.js
index 0d50cb53b..16ee866d1 100644
--- a/js/controllers/home.js
+++ b/js/controllers/home.js
@@ -23,8 +23,7 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
       return;
     }
     $rootScope.starting = true;
-    identityService.open(form.email.$modelValue, form.password.$modelValue, function(err) {
-      $rootScope.starting = false;
+    identityService.open(form.email.$modelValue, form.password.$modelValue, function(err, iden) {
       if (err) {
         copay.logger.warn(err);
         if ((err.toString() || '').match('PNOTFOUND')) {
diff --git a/js/models/Identity.js b/js/models/Identity.js
index 283bb688e..002a78517 100644
--- a/js/models/Identity.js
+++ b/js/models/Identity.js
@@ -444,7 +444,8 @@ Identity.importFromFullJson = function(str, password, opts, cb) {
  * @emits newWallet  (walletId)
  */
 Identity.prototype.bindWallet = function(w) {
-  this.wallets[w.getId()] = w;
+  var self = this;
+  self.wallets[w.getId()] = w;
   log.debug('Binding wallet:' + w.getName());
 
   w.on('txProposalsUpdated', function() {
diff --git a/js/services/identityService.js b/js/services/identityService.js
index 886e48bee..ad72512b0 100644
--- a/js/services/identityService.js
+++ b/js/services/identityService.js
@@ -83,7 +83,6 @@ angular.module('copayApp.services')
 
       copay.Identity.open(opts, function(err, iden) {
         if (err) return cb(err);
-        console.log('[identityService.js.95] LISTO OPEN!!'); //TODO
         root.bind(iden);
         iden.openWallets();
         return cb();
@@ -256,6 +255,7 @@ angular.module('copayApp.services')
         copay.logger.debug('newWallet:', w.getName(), wid, iden.getLastFocusedWalletId());
         root.installWalletHandlers(w);
         if (wid == iden.getLastFocusedWalletId()) {
+          $rootScope.starting = false;
           copay.logger.debug('GOT Focused wallet:', w.getName());
           root.setFocusedWallet(w, true);
           root.goWalletHome();