Changed disable/enable logic to fit better to the other settings

Change-Id: I50401fbb8c031879b33ce01b735ab9b08f7eda6f