Missed a few changes
Merge pull request #2104 from ussuri/enabled-disabled-for-spark-button

Missed a few changes