Equivalent fix to 0e69b176eb56baf77d26e4b2b1670b44e700b516 for user photos