Finish off user-disable feature