RF-13569: fix avatar display after edit