fixes #6003 - don't render user default loc/org object directly
(cherry picked from commit ecac9440024dd86cb1ef0864ff024763a2225cfa)
fixes #6003 - don't render user default loc/org object directly
(cherry picked from commit ecac9440024dd86cb1ef0864ff024763a2225cfa)