Client EVR spam fix