Redirect not working after FB login / register

Hi,

I’m using the Facebook registration process that comes with Kleo and all works well except in one instance. Settings in the theme are to reload the current page after login and in GD BuddyPress integration they are on default. So when I login from the dashboard widget, the current page gets reloaded.

Where it doesn’t work is when adding a listing. An unlogged user gets forwarded to a URL that looks like this: https://www.arbolife.com/directory-login/?redirect_add_listing=https%3A%2F%2Fwww.arbolife.com%2Fdirectory-add-listing%2F%3Flisting_type%3Dgd_restaurant

When creating a user or logging in with username/password, the redirect works. But with the Facebook login (or registration), it tries to reload the current page after successfully logging in. The problem is that for a logged in user to load the URL I mentioned above, it takes them to the home page and not to the intended URL which should be: https://www.arbolife.com/directory-add-listing/?listing_type=gd_restaurant

How could this be fixed?

Thanks,
Marc