UserSettings store handling made more correct