[3.8] Fix #1571 : Cleanup user settings, fix user settings calls