Fix 3rd party auth string interpolation, address design feedback

@hkim823, as discussed. This addresses design feedback on my previous commit and fixes a string interpolation issue.