Add logout logics again