issue #19051: using username from dataserver table

I mistakenly put 19199's commit in here as well. Both should be pulled, though.