fixes #9856 - include locations and organizations in user output
(cherry picked from commit 4d7294767840da554b382b6c37d080870537509b)
fixes #9856 - include locations and organizations in user output
(cherry picked from commit 4d7294767840da554b382b6c37d080870537509b)