diff --git a/addons/edi/controllers/main.py b/addons/edi/controllers/main.py
index 1de3ff8ae63..71560aa9e60 100644
--- a/addons/edi/controllers/main.py
+++ b/addons/edi/controllers/main.py
@@ -19,10 +19,9 @@ class EDI(openerpweb.Controller):
     _cp_path = "/edi"
 
     def template(self, req, mods='web,edi'):
-        self.wc = openerpweb.controllers_path['/web/webclient']
         d = {}
-        d["js"] = "\n".join('<script type="text/javascript" src="%s"></script>'%i for i in self.wc.manifest_list(req, mods, 'js'))
-        d["css"] = "\n".join('<link rel="stylesheet" href="%s">'%i for i in self.wc.manifest_list(req, mods, 'css'))
+        d["js"] = "\n".join('<script type="text/javascript" src="%s"></script>'%i for i in webmain.manifest_list(req, mods, 'js'))
+        d["css"] = "\n".join('<link rel="stylesheet" href="%s">'%i for i in webmain.manifest_list(req, mods, 'css'))
         d["modules"] = simplejson.dumps(mods.split(','))
         return d
 
diff --git a/addons/edi/static/src/js/edi.js b/addons/edi/static/src/js/edi.js
index 995012cb3c5..f17261a4244 100644
--- a/addons/edi/static/src/js/edi.js
+++ b/addons/edi/static/src/js/edi.js
@@ -154,7 +154,7 @@ openerp.edi.EdiImport = openerp.web.OldWidget.extend({
     on_imported: function(response) {
         if ('action' in response) {
             this.rpc("/web/session/save_session_action", {the_action: response.action}, function(key) {
-                window.location = "/web/webclient/home#sa="+encodeURIComponent(key);
+                window.location = "/#sa="+encodeURIComponent(key);
             });
         }
         else {
diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py
index 700b9648237..e497f902dc2 100644
--- a/addons/plugin/plugin_handler.py
+++ b/addons/plugin/plugin_handler.py
@@ -19,7 +19,7 @@ class plugin_handler(osv.osv_memory):
         base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='http://localhost:8069', context=context)
         if base_url:
             user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-            base_url += '/web/webclient/login?db=%s&login=%s&key=%s#id=%s&model=%s' % (cr.dbname, user.login, user.password, res_id, model)
+            base_url += '/login?db=%s&login=%s&key=%s#id=%s&model=%s' % (cr.dbname, user.login, user.password, res_id, model)
         return base_url
 
     def is_installed(self, cr, uid):
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 23245e12a2d..5c6cc973fe7 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -86,7 +86,7 @@ class share_wizard(osv.TransientModel):
         # NOTE: take _ids in parameter to allow usage through browse_record objects
         base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='', context=context)
         if base_url:
-            base_url += '/web/webclient/login?db=%(dbname)s&login=%(login)s&key=%(password)s'
+            base_url += '/login?db=%(dbname)s&login=%(login)s&key=%(password)s'
             extra = context and context.get('share_url_template_extra_arguments')
             if extra:
                 base_url += '&' + '&'.join('%s=%%(%s)s' % (x,x) for x in extra)