Prevent settings loss during activation. #2330