Set checkbox to checked by default and fix condition on where it appears - refs BT#8423