Changed login and logout events to logged-in andlogged-out