Tweak session, add logout