Added support for autodisable in UI