diff --git a/addons/portal_customer_lead/__openerp__.py b/addons/portal_customer_lead/__openerp__.py
index f0d4d043edc..1221da468e5 100644
--- a/addons/portal_customer_lead/__openerp__.py
+++ b/addons/portal_customer_lead/__openerp__.py
@@ -34,10 +34,9 @@ A portal_customer_lead will show the own leads of the customer.
     'website': 'http://www.openerp.com',
   
     'update_xml': [
-    
-        'portal_customer_lead_view.xml',
-        'portal_customer_lead_data.xml',
-#        'security/ir.model.access.csv',
+        'security/portal_customer_lead_security.xml',
+        'security/ir.model.access.csv',
+        'portal_customer_lead_menu.xml',
             ],
     'installable': True,
 }
diff --git a/addons/portal_customer_lead/portal_customer_lead_data.xml b/addons/portal_customer_lead/portal_customer_lead_data.xml
deleted file mode 100644
index ff6ccaa8de8..00000000000
--- a/addons/portal_customer_lead/portal_customer_lead_data.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-    <!-- lead access-->
-        <record id="portal_customer_lead_access_right" model="ir.model.access">
-            <field name="name">Customer Lead</field>
-            <field ref="crm.model_crm_lead" name="model_id"/>
-            <field name="perm_read">True</field>
-            <field name="perm_write">True</field>
-            <field name="perm_create">True</field>
-        </record>
-
-        <record id="customer_own_lead" model="ir.rule">
-            <field name="name">Customer Lead</field>
-            <field ref="crm.model_crm_lead" name="model_id"/>
-            <field eval="1" name="global"/>
-            <field name="domain_force">[('partner_id.email','=',user.login)]</field>
-        </record>
-
-        <!-- contact access-->
-
-        <record id="portal_customer_contact_access_right" model="ir.model.access">
-            <field name="name">Customer Contact</field>
-            <field ref="base.model_res_partner" name="model_id"/>
-            <field name="perm_read">True</field>
-            <field name="perm_write">True</field>
-            <field name="perm_create">True</field>
-        </record>
-
-        <record id="customer_own_contact" model="ir.rule">
-            <field name="name">Customer Contact</field>
-            <field ref="base.model_res_partner" name="model_id"/>
-            <field eval="1" name="global"/>
-            <field name="domain_force">[('email','=',user.login)]</field>
-        </record>
-
-        <record model="res.portal" id="res_portal_lead">
-            <field name="name">portal customer lead</field>
-            <field name="model_access" eval="[(6,0,[ref('portal_customer_lead_access_right'),ref('portal_customer_contact_access_right')])]"/>
-            <field name="menu_access" eval="[(4,ref('menu_customer_portal_leads')),(4,ref('menu_customer_contact'))]"/>
-            <field name="rule_groups" eval="[(4,ref('customer_own_lead')),(4,ref('base.group_partner_manager'))]"/>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/portal_customer_lead/portal_customer_lead_view.xml b/addons/portal_customer_lead/portal_customer_lead_menu.xml
similarity index 100%
rename from addons/portal_customer_lead/portal_customer_lead_view.xml
rename to addons/portal_customer_lead/portal_customer_lead_menu.xml
diff --git a/addons/portal_customer_lead/security/ir.model.access.csv b/addons/portal_customer_lead/security/ir.model.access.csv
index 7f12625c931..de8873ddb0f 100644
--- a/addons/portal_customer_lead/security/ir.model.access.csv
+++ b/addons/portal_customer_lead/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_crm_lead_portal,crm.lead,crm.model_crm_lead,portal_customer.group_sale_salesman,1,1,1,0
+access_portal_crm_lead,portal.crm.lead,crm.model_crm_lead,group_portal_customer_lead,1,1,1,0
 
diff --git a/addons/portal_customer_lead/security/portal_customer_lead_security.xml b/addons/portal_customer_lead/security/portal_customer_lead_security.xml
new file mode 100644
index 00000000000..1e8874930f1
--- /dev/null
+++ b/addons/portal_customer_lead/security/portal_customer_lead_security.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    <!-- lead access-->
+       <record id="customer_contact_rule" model="ir.rule">
+            <field name="name">Customer Contact</field>
+            <field ref="base.model_res_partner" name="model_id"/>
+            <field eval="1" name="global"/>
+            <field name="domain_force">[('email','=',user.login)]</field>
+       </record>
+
+       <record id="portal_customer_lead_rule" model="ir.rule">
+            <field name="name">Personal Lead</field>
+            <field ref="crm.model_crm_lead" name="model_id"/>
+            <field name="domain_force">[('partner_id.email','=',user.login)]</field>
+            <field name="global" eval="True"/>
+       </record>
+
+       <record id="group_portal_customer_lead" model="res.groups">
+            <field name="name">Portal Lead Group</field>
+            <field ref="base.module_category_sales_management" name="category_id"/>
+            <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
+            <field name="rule_groups" eval="[(4, ref('portal_customer_lead_rule')),(4, ref('customer_contact_rule'))]"/>
+        </record>
+
+        <record id="portal_customer_lead" model="res.portal">
+            <field name="name">Customer Lead Portal</field>
+            <field name="group_id" ref="group_portal_customer_lead"/>
+        </record>
+
+    </data>
+</openerp>