Prepend avatar URL with base from config.
Fixed merge conflicts.