Comment 2 for bug 1757507

While this patch addresses half of the issue, it doesn't actually address user search, so away goes the pullrequest tag. Will try to figure out how to make that all work out.