Remove duplicated code in Users Repo

[#65037890]