User settings

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

I would stay on the safe side and keep it like this.