diff --git a/js/controllers/head.js b/js/controllers/head.js
index cf2be5a91..899d445b1 100644
--- a/js/controllers/head.js
+++ b/js/controllers/head.js
@@ -64,8 +64,5 @@ angular.module('copayApp.controllers').controller('HeadController', function($sc
     $rootScope.$watch('title', function(newTitle, oldTitle) {
       $scope.title = newTitle;
     });
-    $rootScope.$on('signout', function() {
-      $scope.signout();
-    });
   }
 });
diff --git a/js/controllers/home.js b/js/controllers/home.js
index b3d804f85..153ee30f1 100644
--- a/js/controllers/home.js
+++ b/js/controllers/home.js
@@ -14,6 +14,11 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
       $scope.confirmedEmail = true;
       $rootScope.fromEmailConfirmation = false;
     }
+
+    if($rootScope.iden) {
+      identityService.goWalletHome();
+    }
+
     Compatibility.check($scope);
     pinService.check(function(err, value) {
       $scope.hasPin = value;
diff --git a/js/controllers/sidebar.js b/js/controllers/sidebar.js
index a6f7533ae..6dadb4057 100644
--- a/js/controllers/sidebar.js
+++ b/js/controllers/sidebar.js
@@ -25,7 +25,8 @@ angular.module('copayApp.controllers').controller('SidebarController', function(
   }];
 
   $scope.signout = function() {
-    $scope.$emit('signout');
+    $rootScope.signingOut = true;
+    identityService.signout();
   };
 
   $scope.isActive = function(item) {