Retain all old settings when running the setup wizard

Fixes #825
Fixes #759