Improved user command

__Tasks:__

- [ ] gather feedback for my changes

__Informations:__

| Q             | A
| ------------- | ---
| Tests pass?   | yes
| Fixed tickets | fixes #8 , fixes #87 
| BC Breaks     | none
| Doc           | none