TBD-1026: Fix a username issue when a connection is used.