Use user-string in authentication attributes.

Based on changes under review in PR #2116
fixed.  Will rebase when #2116 in.