diff --git a/addons/payment_buckaroo/controllers/main.py b/addons/payment_buckaroo/controllers/main.py
index d3fe5b196fc..bc533b48612 100644
--- a/addons/payment_buckaroo/controllers/main.py
+++ b/addons/payment_buckaroo/controllers/main.py
@@ -30,9 +30,6 @@ class BuckarooController(http.Controller):
         """ Buckaroo."""
         _logger.info('Buckaroo: entering form_feedback with post data %s', pprint.pformat(post))  # debug
         request.registry['payment.transaction'].form_feedback(request.cr, SUPERUSER_ID, post, 'buckaroo', context=request.context)
-        return_url = post.pop('return_url', '')
-        if not return_url:
-            data ='' + post.pop('ADD_RETURNDATA', '{}').replace("'", "\"")
-            custom = json.loads(data)
-            return_url = custom.pop('return_url', '/')
+        post = dict((key.upper(), value) for key, value in post.items())
+        return_url = post.get('ADD_RETURNDATA') or '/'
         return werkzeug.utils.redirect(return_url)
diff --git a/addons/payment_buckaroo/models/buckaroo.py b/addons/payment_buckaroo/models/buckaroo.py
index 87ad7605c7d..eded57800f9 100644
--- a/addons/payment_buckaroo/models/buckaroo.py
+++ b/addons/payment_buckaroo/models/buckaroo.py
@@ -107,7 +107,7 @@ class AcquirerBuckaroo(osv.Model):
             'Brq_culture': (partner_values.get('lang') or 'en_US').replace('_', '-'),
         })
         if buckaroo_tx_values.get('return_url'):
-            buckaroo_tx_values['add_returndata'] = {'return_url': '%s' % buckaroo_tx_values.pop('return_url')}
+            buckaroo_tx_values['add_returndata'] = buckaroo_tx_values.pop('return_url')
         else: 
             buckaroo_tx_values['add_returndata'] = ''
         buckaroo_tx_values['Brq_signature'] = self._buckaroo_generate_digital_sign(acquirer, 'in', buckaroo_tx_values)