NR-655 : problems with changing User's avatar

more small fixes