diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index c7dabbaf0d0..cd0dfaa6940 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -69,7 +69,7 @@ def urlplus(url, params):
 
     # can't use urlencode because it encodes to (ascii, replace) in p2
     return "%s?%s" % (url, '&'.join(
-        k + '=' + urllib.quote_plus(v if isinstance(v, str) else v.encode('utf-8'))
+        k + '=' + urllib.quote_plus(v.encode('utf-8') if isinstance(v, unicode) else str(v))
         for k, v in params.iteritems()
     ))