Improving user service v2
5 files changed