Fix issue with redisplay of avatar upload