Bug/1323 udfc search auth

Looks like I'm taking @rickmohr 's commits along for the ride. Should I cherry pick?