Revert "Revert "EB-309 performance fix for user profile page""

This reverts commit c7acf2b32daa06097a3b3a9415f8cd53c2a5d4d5.