Fix login-logout