Reogarnise code in admin to be able to pre-load avatars from plugins
Merge pull request #2001 from xillibit/k30_bugs6

Reogarnise code in admin to be able to pre-load avatars from plugins