User settings

This is a pull request for issues #455 and #456.

Hm, that makes sense. Ok then, it is a small change.