Added more defined validation in order to override that options in local settings