Fully fixed logout