Yes, they were both in on it. As were T'Pol and Reed. The novels have completely rewritten TATV, stating what was seen in the actual episode was a historically inaccurate holodeck program.
It's hard to believe that nearly three hundred years later, History wasn't corrected yet. I mean even the deepest state secrets have an expiration date.