revert back to login_id for v4 support