Logout works better now