Put back logout evaluate in onWaitTimeout