User refactor

made the user service a bit more sane

Merge request reports

Loading