Logout stopped working, had to revert 2nd last commit...