diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 3b1390f2a72..65e061211f8 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -979,7 +979,7 @@ class Binary(openerpweb.Controller):
             return base64.decodestring(filecontent)
 
     @openerpweb.httprequest
-    def upload(self, request, session_id, callback, ufile=None):
+    def upload(self, request, callback, ufile=None):
         cherrypy.response.timeout = 500
         headers = {}
         for key, val in cherrypy.request.headers.iteritems():
@@ -1006,7 +1006,7 @@ class Binary(openerpweb.Controller):
         return out % (simplejson.dumps(callback), simplejson.dumps(args))
 
     @openerpweb.httprequest
-    def upload_attachment(self, request, session_id, callback, model, id, ufile=None):
+    def upload_attachment(self, request, callback, model, id, ufile=None):
         cherrypy.response.timeout = 500
         context = request.session.eval_context(request.context)
         Model = request.session.model('ir.attachment')
diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py
index ad012a0806c..0f6b7f8031e 100644
--- a/openerpweb/openerpweb.py
+++ b/openerpweb/openerpweb.py
@@ -371,7 +371,8 @@ class HttpRequest(object):
         self.context = kw.get('context', {})
         host = cherrypy.config['openerp.server.host']
         port = cherrypy.config['openerp.server.port']
-        self.session = self.httpsession.setdefault(kw.pop('session_id', None), OpenERPSession(host, port))
+        self.session_id = kw.pop('session_id', None)
+        self.session = self.httpsession.setdefault(self.session_id, OpenERPSession(host, port))
         self.result = ""
         if request.method == 'GET':
             print "GET --> %s.%s %s %r" % (controller.__class__.__name__, f.__name__, request, kw)