Fixes #235
Merge pull request #236 from DoSomething/fixed-settings-update-errors

Fixed Settings update errors