Fixes #980158 - Proper username escaping/unescaping
Merge pull request #3191 from ares/bug/980158

Fixes #980158 - Proper username escaping/unescaping