Updated to use correct user entity.