Issue #3370883: User::load calls should be avoided in classes, use dependency injection instead