Quick improvement for logout

No issue assigned.