refactoring user service (T-5853)