Support ReturnUrl

Linked to Issue #764