Correct Avatar recovery problems

simple mod