Fix user settings precedence
Merge pull request #837 from romainneutron/fix-1618

[3.8] Fix user settings precedence