Percent encoding user info fix, port #521 on master