- Refactored the GetReturnUrl code to use UriBuilder. Cheers @ DFowler!