Adding return url support for login/logout + decorator