Fix #3776: Match with forced visitor Id only if available