diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js
index 66d1793..1a89563 100644
--- a/client/js/controllers/login.js
+++ b/client/js/controllers/login.js
@@ -16,6 +16,7 @@ mainApp.controller('loginCtrl', ['$scope','$sce','Identity', function ($scope,$s
 
 	// Manager logout event
 	$scope.$on('logoutEvent', function(){
+		Identity.logout();
 		$('#loginModal').modal({backdrop: 'static', keyboard: false});
 	});
 
diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js
index 5ec6fa8..940d794 100644
--- a/client/js/controllers/status.js
+++ b/client/js/controllers/status.js
@@ -13,10 +13,8 @@ mainApp.controller('statusCtrl', ['$scope','Identity', '$rootScope', function ($
     $scope.profile=Identity.getProfile();
 
     // Function to logout
-    $scope.logout=function(){
-		Identity.logout();
+    $scope.raiseLogoutEvent=function(){
 		$rootScope.$broadcast('logoutEvent');
-
 	};
 
 }]);
diff --git a/client/partials/nav.html b/client/partials/nav.html
index 3c72844..b3ef76a 100644
--- a/client/partials/nav.html
+++ b/client/partials/nav.html
@@ -32,7 +32,7 @@
             <li><a href="#">Informations</a></li>
             <li><a href="#">Settings</a></li>
             <li role="separator" class="divider"></li>
-            <li><a href="#" ng-click="logout()">Logout</a></li>
+            <li><a href="#" ng-click="raiseLogoutEvent()">Logout</a></li>
           </ul>
         </li>
       </ul>