Usersettings fixed
jwz
mergefix