Updated login-logout