improved: rework enable / enable option setting (follow-up)