More login/logout logging cleanup