further login and logout additions