Did you manage to fix this?  

Great, thanks! So will I 

Did any of you found a solution? Normally with other webshops and paymentproviders I'm able to fix it bij adding a ?utm_nooverride=1  parameter on the return url, but that's nog possible right now. Or maybe do I mis something? Cheers!