Fix user settings being overwritten