Fixed friend methods that were moved from UserHelper