Fix error messages
Add user command