diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 1dc945692c6..b3ce1f806ee 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -448,13 +448,7 @@ class Home(http.Controller):
 
         request.uid = request.session.uid
 
-        version_info = openerp.service.common.exp_version()
-        db_info = {
-            'server_version': version_info.get('server_version'),
-            'server_version_info': version_info.get('server_version_info'),
-        }
         context = {
-            'db_info': json.dumps(db_info),
             'menu_data': request.registry['ir.ui.menu'].load_menus(request.cr, request.uid, request.debug, context=request.context),
             'session_info': json.dumps(request.env['ir.http'].session_info()),
         }
diff --git a/addons/web/models/ir_http.py b/addons/web/models/ir_http.py
index f3a6b1f3921..7299ba910a3 100644
--- a/addons/web/models/ir_http.py
+++ b/addons/web/models/ir_http.py
@@ -1,3 +1,4 @@
+import openerp
 from openerp import models
 from openerp.http import request
 
@@ -8,12 +9,14 @@ class Http(models.Model):
     def session_info(self):
         user = request.env.user
         display_switch_company_menu = user.has_group('base.group_multi_company') and len(user.company_ids) > 1
+        version_info = openerp.service.common.exp_version()
         return {
             "session_id": request.session_id,
             "uid": request.session.uid,
             "user_context": request.session.get_context() if request.session.uid else {},
             "db": request.session.db,
-            "username": request.session.login,
+            "server_version": version_info.get('server_version'),
+            "server_version_info": version_info.get('server_version_info'),
             "name": user.name,
             "company_id": request.env.user.company_id.id if request.session.uid else None,
             "partner_id": request.env.user.partner_id.id if request.session.uid and request.env.user.partner_id else None,
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index c8adedc6f3c..a702984a4e4 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -391,7 +391,6 @@
                     var odoo = {
                         session_info: <t t-raw="session_info"/>,
                         csrf_token: "<t t-esc="request.csrf_token(None)"/>",
-                        db_info: <t t-raw="db_info"/>,
                     };
                 </script>
 
diff --git a/addons/web_analytics/__init__.py b/addons/web_analytics/__init__.py
index e69de29bb2d..bff786c0885 100644
--- a/addons/web_analytics/__init__.py
+++ b/addons/web_analytics/__init__.py
@@ -0,0 +1 @@
+import models
diff --git a/addons/web_analytics/models/__init__.py b/addons/web_analytics/models/__init__.py
new file mode 100644
index 00000000000..8d297897934
--- /dev/null
+++ b/addons/web_analytics/models/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+import ir_http
diff --git a/addons/web_analytics/models/ir_http.py b/addons/web_analytics/models/ir_http.py
new file mode 100644
index 00000000000..ce11f5823fc
--- /dev/null
+++ b/addons/web_analytics/models/ir_http.py
@@ -0,0 +1,9 @@
+from openerp import models, service
+
+class Http(models.Model):
+    _inherit = 'ir.http'
+
+    def session_info(self):
+        result = super(Http, self).session_info()
+        result['version_info'] = service.common.exp_version()
+        return result
diff --git a/addons/web_analytics/static/src/js/web_analytics.js b/addons/web_analytics/static/src/js/web_analytics.js
index a778dc71709..f3764493634 100644
--- a/addons/web_analytics/static/src/js/web_analytics.js
+++ b/addons/web_analytics/static/src/js/web_analytics.js
@@ -81,14 +81,10 @@ var Tracker = core.Class.extend({
     * to GA.
     */
     initialize_custom: function() {
-        var self = this;
-        session.rpc("/web/webclient/version_info", {})
-            .done(function(res) {
-                _gaq.push(['_setCustomVar', 5, 'Version', res.server_version, 3]);
-                self._push_customvars();
-                self.initialized.resolve(self);
-            });
-        return self.initialized;
+        _gaq.push(['_setCustomVar', 5, 'Version', session.version_info.server_version, 3]);
+        this._push_customvars();
+        this.initialized.resolve(this);
+        return this.initialized;
     },
 
     /*