Fixed multiple browser log out bugs
merge conflict