diff --git a/addons/im_livechat/im_livechat.py b/addons/im_livechat/im_livechat.py
index e322467e64e..ca4a5f3ac20 100644
--- a/addons/im_livechat/im_livechat.py
+++ b/addons/im_livechat/im_livechat.py
@@ -40,10 +40,10 @@ class LiveChatController(http.Controller):
 
     def _auth(self, db):
         reg = openerp.modules.registry.RegistryManager.get(db)
-        uid = openerp.netsvc.dispatch_rpc('common', 'authenticate', [db, "anonymous", "anonymous", None])
+        uid = request.uid
         return reg, uid
 
-    @http.route('/im_livechat/loader', auth="none")
+    @http.route('/im_livechat/loader', auth="public")
     def loader(self, **kwargs):
         p = json.loads(kwargs["p"])
         db = p["db"]
@@ -59,7 +59,7 @@ class LiveChatController(http.Controller):
             return request.make_response(env.get_template("loader.js").render(info),
                  headers=[('Content-Type', "text/javascript")])
 
-    @http.route('/im_livechat/web_page', auth="none")
+    @http.route('/im_livechat/web_page', auth="public")
     def web_page(self, **kwargs):
         p = json.loads(kwargs["p"])
         db = p["db"]
@@ -72,7 +72,7 @@ class LiveChatController(http.Controller):
             return request.make_response(env.get_template("web_page.html").render(info),
                  headers=[('Content-Type', "text/html")])
 
-    @http.route('/im_livechat/available', type='json', auth="none")
+    @http.route('/im_livechat/available', type='json', auth="public")
     def available(self, db, channel):
         reg, uid = self._auth(db)
         with reg.cursor() as cr:
diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py
index 607dde3aa71..8013622ca1d 100644
--- a/addons/share/__openerp__.py
+++ b/addons/share/__openerp__.py
@@ -46,7 +46,8 @@ synchronization with other companies.
     'data': [
         'security/share_security.xml',
         'res_users_view.xml',
-        'wizard/share_wizard_view.xml'
+        'wizard/share_wizard_view.xml',
+        'share_demo.xml',
     ],
     'installable': True,
     'auto_install': True,
diff --git a/addons/share/share_data.xml b/addons/share/share_data.xml
new file mode 100644
index 00000000000..aba154a6403
--- /dev/null
+++ b/addons/share/share_data.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="base.public_user" model="res.users">
+            <field eval="[(4, ref('group_share_user'))]" name="groups_id"/>
+            <field name="share" eval="True" />
+        </record>
+    </data>
+</openerp>
diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml
index a12909337ff..bf4298da273 100644
--- a/addons/website/data/website_data.xml
+++ b/addons/website/data/website_data.xml
@@ -26,21 +26,6 @@
             <field name="sequence" type="int">60</field>
         </record>
 
-        <record id="public_user" model="res.users">
-            <field name="name">Anonymous</field>
-            <field name="login">public</field>
-            <field name="password">public</field>
-            <!-- Avoid auto-including this demo user in any default group -->
-            <field name="groups_id" eval="[(5,)]"/>
-            <field name="image" type="base64" file="website/static/img/public_user-image.png"/>
-            <field name="share" eval="True"/>
-            <field name="active" eval="False"/>
-        </record>
-
-        <record id="base.group_public" model="res.groups">
-            <field name="users" eval="[(4, ref('website.public_user'))]"/>
-        </record>
-
         <record id="base.group_website_publisher" model="res.groups">
             <field name="name">Display Editor Bar on Website</field>
             <field name="category_id" ref="base.module_category_website"/>
diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index 02e320deeb0..d8a6f5c5fa1 100644
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -31,13 +31,6 @@ class ir_http(orm.AbstractModel):
             page=PageConverter,
         )
 
-    def _auth_method_public(self):
-        if not request.session.uid:
-            request.uid = request.registry['website'].get_public_user(
-                request.cr, openerp.SUPERUSER_ID, request.context)
-        else:
-            request.uid = request.session.uid
-
     def _dispatch(self):
         first_pass = not hasattr(request, 'website')
         request.website = None
diff --git a/addons/website/static/img/public_user-image.png b/addons/website/static/img/public_user-image.png
deleted file mode 100644
index e333176e3e4..00000000000
Binary files a/addons/website/static/img/public_user-image.png and /dev/null differ