Fix defaults overriding stored data on update
Merge branch 'fix-default-update' into jokull

* fix-default-update:
  Fix defaults overriding stored data on update