fix Logout issue - issue #6