Merge pull request #4440 from Montellese/settings_fixes

Two fixes in the settings system