Avatars folder path change and flow fix for update data