fix fallout from NG auth changes, RT#21563