How about this: when the Helmet check is done at the drawbridge, instead, there is an NPC dialogue that asks/prompts your Toon, in-character, that they enter the FAI and thus, must dispel their magics.
That would fall in-line with:
And, most importantly, it would hopefully end the running around the FAI courtyard keyed up like a Christmas Tree with a Planar with WEAPON OUT, in tow.At the Friendly Arm Inn, peace was secured by the guards, who insisted that all weapons be left at the gate and that all wizards and clerics tie one thumb to their belts, a practice that spilled over to fighting monks as well.
Please!!!!!!!!!!!!! Please?