fixed logout and session-token problems