Fixes #980158 - Proper username escaping/unescaping

see https://bugzilla.redhat.com/show_bug.cgi?id=980158 for more details