user refactor, EDUID-155