Fix a merge issue for settings not yet available to the user