SD-277 simplify the way avatar is stored on the user