Further fixing of the troublesome {domain}\{username} format

Got it this time, it is tested and working!