Merge pull request #246 from settinghead/master

User settings validation issues