more updates to LoginLogout()