Fixed bug that prevented new users saving settings.
Merge origin/master