Better support for custom party hints for non-operator users (#3367)

Better support for custom party hints for non-operator users (#3367) #1343