Fixes #980158 - Proper username escaping/unescaping