[avatar] Fixed email leak issue