Change to support encoded characters in usernames/password