Fixed update message and now allow for users to disable this feature