Fixed an issue with image scaling on admin user images.
Resolved merge conflict against focus branch.