Follow up on Bug 5462: fixing variable names breaks messaging preference form