Who played the witch hunter in Buffy and Charmed?

In both Charmed and Buffy there was a single episode each with the same witch hunter in them. I think he was Michael Massee but when I look it up he has no mention and neither does the witch hunter so I can't find out if his name was something else. It's really frustrating because he popped up in Rizzoli and Isles as Hoyt and Massee is him but I don't see him anywhere else and I KNOW he's been in several other shows that lack a mentioning.