Improve logout again