NXP-13342 Avoid reentrency caused by a listener
NXP-13360: don't quote at character in username