Add support for return url in logout