She does have a potion! For ten silvers apiece one de-swanning potion can be provided. Side effects may include honking at random intervals, increased feelings of protectiveness, and turning back into a swan once a month at the dark of the moon. Other than that, though, the villagers should be just fine.

As for the Dwarf Queen, why, does she want a hook up?