[Finish #38329907] Make sure both avatar links point to the same place