Avoid extra slash in redirect URI

[SeeRM #8507]
Land #2538 - Fix redirect URLs