Merge pull request #2361 from thefuzzy0ne/fix/userguide

There are 21 preferences, not 17