Made the user config code more sane
Merge commit '1d5d774'