Fixes user and username
Merge CDB-2709 into release/2.13.5