Fixed default avatars on the Discussion settings page replaced by user's custom avatar (3.0-unstable)

This is the same patch as #2389, applied to the 3.0-unstable branch. (I'm pretty sure this works, though I'm not using 3.0 so I haven't tested it personally.)