diff --git a/public/modules/core/controllers/header.client.controller.js b/public/modules/core/controllers/header.client.controller.js
index 4e49a3d2..ae97cdcf 100755
--- a/public/modules/core/controllers/header.client.controller.js
+++ b/public/modules/core/controllers/header.client.controller.js
@@ -39,12 +39,8 @@ angular.module('core').controller('HeaderController', ['$rootScope', '$scope', '
 		    var promise = User.logout();
 			promise.then(function() {
 				Auth.logout();
-				Auth.ensureHasCurrentUser(User);
 				$scope.user = $rootScope.user = null;
-				$state.go('listForms');
-
-				//Refresh view
-				$state.reload();
+				$state.go('signin', { reload: true });
 			},
 			function(reason) {
 			  	console.error('Logout Failed: ' + reason);
diff --git a/public/modules/users/controllers/authentication.client.controller.js b/public/modules/users/controllers/authentication.client.controller.js
index 811e855f..4e952039 100755
--- a/public/modules/users/controllers/authentication.client.controller.js
+++ b/public/modules/users/controllers/authentication.client.controller.js
@@ -17,7 +17,7 @@ angular.module('users').controller('AuthenticationController', ['$scope', '$loca
 						Auth.login(response);
 						$scope.user = $rootScope.user = Auth.ensureHasCurrentUser(User);
 
-						if(statesToIgnore.indexOf($state.previous.state.name) === -1) {
+						if($state.previous && statesToIgnore.indexOf($state.previous.state.name) === -1) {
 							$state.go($state.previous.state.name, $state.previous.params);
 						} else {
 							$state.go('listForms');