44591773: remove redundant user.all
44591773: revise to previous logic