No longer overwrite non-default *_KEY and *_SALT values.

Fixes #22