Change default avatar handling

One change requires a change (hopefully coming in BP 2.2) to work.