[1.6.x] Fixed #23314 -- Tempered recommendation of storing profile data on custom user.

Thanks gavinwahl for the report.

Backport of 3569536491 from master