diff --git a/carrier.py b/carrier.py
index 12743153d9..07024eb6a0 100644
--- a/carrier.py
+++ b/carrier.py
@@ -56,7 +56,8 @@ class Carrier(ModelSQL, ModelView):
         'Compute carrier sale price with currency'
         user_obj = Pool().get('res.user')
         if carrier.carrier_cost_method == 'product':
-            user = user_obj.browse(Transaction().user)
+            user = user_obj.browse(Transaction().user
+                or Transaction().context.get('user'))
             return carrier.carrier_product.list_price, user.company.currency.id
         return 0, False
 
diff --git a/setup.py b/setup.py
index 3b2cd175dd..4534033607 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ minor_version = int(minor_version)
 
 requires = []
 for dep in info.get('depends', []):
-    if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+    if not re.match(r'(ir|res|webdav)(\W|$)', dep):
         requires.append('trytond_%s >= %s.%s, < %s.%s' %
                 (dep, major_version, minor_version, major_version,
                     minor_version + 1))