More changes with login and logout