Allow on/off (bug #2233)