Add support for per-user return url