Fixed bugs in enabling/disabling diagnostic forms