Fix locale service provider
Fix editing default user settings
Merge pull request #787 from romainneutron/conf-fixes

[3.8] Conf fixes