There's a patch in core's issue queue #668058: Resubmitting a user picture does show the first uploaded picture

Maintainer could you take a look on it.

Suppose better fix this in core then maintain a module!