User settings

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

No no, leave it then. There is always possibility of race conditions.