#266, change logout strategy