Improve Settings to avoid "This is required field" messages