diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py
index 0eceec3f46b..e7b89bb0732 100644
--- a/addons/portal/wizard/portal_wizard.py
+++ b/addons/portal/wizard/portal_wizard.py
@@ -147,6 +147,7 @@ class wizard(osv.osv_memory):
                     'context_lang': u.lang,
                     'share': True,
                     'partner_id': u.partner_id and u.partner_id.id,
+                    'groups_id': [(6, 0, [])],
                 } for u in wiz.user_ids if u.user_email not in existing_logins ]
             portal_obj.write(cr, ROOT_UID, [wiz.portal_id.id],
                 {'users': [(0, 0, data) for data in new_users_data]}, context0)
diff --git a/addons/portal_customer/portal_customer_view.xml.THIS b/addons/portal_customer/portal_customer_view.xml.THIS
deleted file mode 100644
index b8f734ea7c6..00000000000
--- a/addons/portal_customer/portal_customer_view.xml.THIS
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-
-    <data>
-      <menuitem name="Customer Portal" id="customer_portal" />
-        
-        <menuitem name="Address Book" id="customer_portal_address_book" parent="customer_portal" action="base.action_partner_form"/>
-        
-        <menuitem name="Track Orders" id="customer_portal_track_orders" parent="customer_portal"/>
-            <menuitem name="Quotation" id="customer_portal_quotation" parent="customer_portal_track_orders"/>
-            <menuitem name="Sales Orders" id="customer_portal_sales_orders" parent="customer_portal_track_orders"/>
-          
-            <menuitem name="Delivery Orders" id="customer_portal_delivery" parent="customer_portal_track_orders"/>
-            <menuitem name="Registration" id="customer_portal_registration" parent="customer_portal_track_orders"/>
-        
-        <menuitem name="Invoice and Payments" id="customer_portal_invoice_payements" parent="customer_portal"/>
-            <menuitem name="Invoice" id="customer_portal_invoice" parent="customer_portal_invoice_payements"/>
-            <menuitem name="Payments" id="customer_portal_payments" parent="customer_portal_invoice_payements"/>
-            
-        <menuitem name="Services" id="customer_portal_services" parent="customer_portal"/>
-            <menuitem name="Events" id="customer_portal_events" parent="customer_portal_services"/>
-            <menuitem name="Products" id="customer_portal_products" parent="customer_portal_services"/>
-            <menuitem name="Tasks" id="customer_portal_tasks" parent="customer_portal_services"/>
-        
-        <menuitem name="After Sales Services" id="customer_portal_after_sales" parent="customer_portal"/>
-            <menuitem name="Issues" id="customer_portal_issues" parent="customer_portal_after_sales"/>
-            <menuitem name="Claims" id="customer_portal_claims" parent="customer_portal_after_sales"/>
-            <menuitem name="Feedback" id="customer_portal_feedback" parent="customer_portal_after_sales"/>
-
-        <menuitem name="Contact Us" id="customer_portal_contact" parent="customer_portal"/>
-        
-            
-    </data>
-    
-</openerp>
-    
diff --git a/addons/portal_customer/portal_demo.xml.THIS b/addons/portal_customer/portal_demo.xml.THIS
deleted file mode 100644
index 43c654b3949..00000000000
--- a/addons/portal_customer/portal_demo.xml.THIS
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    
-    <data>
-    
-        <!--
-            Sale Portal Demo
-        -->
-        
-        <record id="portal_sale_order_access_right" model="ir.model.access">
-            <field name="name">Sale Order</field>
-            <field ref="sale.model_sale_order" name="model_id"/>
-            <field name="perm_read">True</field>
-        </record>
-        
-        <record id="portal_sale_order_line_access_right" model="ir.model.access">
-            <field name="name">Sale Order Line</field>
-            <field ref="sale.model_sale_order_line" name="model_id"/>
-            <field name="perm_read">True</field>
-        </record>
-        
-        <record id="portal_stock_picking_access_right" model="ir.model.access">
-            <field name="name">Stock Picking</field>
-            <field ref="sale.model_stock_picking" name="model_id"/>
-            <field name="perm_read">True</field>
-            <!--field name="perm_write">True</field>
-            <field name="perm_create">True</field>
-            <field name="perm_unlink">True</field-->
-        </record>
-        
-        <record id="portal_account_invoice_access_right" model="ir.model.access">
-            <field name="name">Account Invoice</field>
-            <field ref="account.model_account_invoice" name="model_id"/>
-            <field name="perm_read">True</field>
-            <!--field name="perm_write">True</field>
-            <field name="perm_create">True</field>
-            <field name="perm_unlink">True</field-->
-        </record>
-        
-        <record id="portal_account_invoice_line_access_right" model="ir.model.access">
-            <field name="name">Account Invoice Line</field>
-            <field ref="account.model_account_invoice_line" name="model_id"/>
-            <field name="perm_read">True</field>
-            <!--field name="perm_write">True</field>
-            <field name="perm_create">True</field>
-            <field name="perm_unlink">True</field-->
-        </record>
-        
-        
-        <record id="portal_sale_order_user_rule" model="ir.rule">
-            <field name="name">Personal Leads</field>
-            <field ref="sale.model_sale_order" name="model_id"/>
-            <field name="domain_force">['|',('partner_id.email','=',user.login),('user_id','=',False)]</field>
-            <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
-        </record>
-        
-        <record id="portal_stock_picking_user_rule" model="ir.rule">
-            <field name="name">Personal Leads</field>
-            <field ref="stock.model_stock_picking" name="model_id"/>
-            <field name="domain_force">[('partner_id.email','=',user.login)]</field>
-            <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
-        </record>
-        
-        <record id="portal_account_invoice_user_rule" model="ir.rule">
-            <field name="name">Personal Leads</field>
-            <field ref="account.model_account_invoice" name="model_id"/>
-            <field name="domain_force">[('partner_id.email','=',user.login)]</field>
-            <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
-        </record>
-        
-        <record id="res_portal_demo" model="res.portal">
-            <field name="name">Sales Portal</field>
-            <field name="menu_access" eval="[(4, ref('sale.menu_sale_quotations')), (4, ref('sale.menu_sale_order')), (4, ref('base.menu_product')), (4, ref('stock.menu_action_picking_tree')), (4, ref('account.menu_action_invoice_tree1')), (4, ref('account.menu_finance')), (4, ref('stock.menu_stock_root'))]"/>
-            <!--field name="implied_ids" eval="[(4, ref('base.group_sale_salesman')), (4, ref('account.group_account_invoice')), (4, ref('stock.group_stock_user'))]"/-->
-            <field name="rule_groups" eval="[(4, ref('portal_sale_order_user_rule')), (4, ref('portal_stock_picking_user_rule')), (4, ref('portal_account_invoice_user_rule'))]"/>
-            <field name="model_access" eval="[(6,0,[ref('portal_sale_order_access_right'), ref('portal_sale_order_line_access_right'), ref('portal_stock_picking_access_right'), ref('portal_account_invoice_access_right'), ref('portal_account_invoice_line_access_right')])]"/>
-        </record>
-        
-    </data>
-    
-</openerp>
diff --git a/addons/portal_customer/security/portal_customer_security.xml b/addons/portal_customer/security/portal_customer_security.xml
index 19873f23e26..b6a901cdf0c 100644
--- a/addons/portal_customer/security/portal_customer_security.xml
+++ b/addons/portal_customer/security/portal_customer_security.xml
@@ -14,8 +14,7 @@
             <field name="name">Sales Portal</field>
             <field name="group_id" ref="group_sales_portal"/>
         </record>
-        
-    
+            
         <!-- Sale Portal Access Rules -->
         
         <record id="portal_sale_order_user_rule" model="ir.rule">
diff --git a/addons/portal_customer/security/security_customer_portal.xml b/addons/portal_customer/security/security_customer_portal.xml
deleted file mode 100644
index 2706b75ad5e..00000000000
--- a/addons/portal_customer/security/security_customer_portal.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    
-    <data>
-
-        <!-- model access  -->
-        
-        <record id="portal_sale_order_access_right" model="ir.model.access">
-            <field name="name">Sale Order</field>
-            <field ref="sale.model_sale_order" name="model_id"/>
-            <field name="perm_read">True</field>
-        </record>
-        
-        <record id="portal_sale_order_line_access_right" model="ir.model.access">
-            <field name="name">Sale Order Line</field>
-            <field ref="sale.model_sale_order_line" name="model_id"/>
-            <field name="perm_read">True</field>
-        </record>
-        
-        <record id="portal_stock_picking_access_right" model="ir.model.access">
-            <field name="name">Stock Picking</field>
-            <field ref="sale.model_stock_picking" name="model_id"/>
-            <field name="perm_read">True</field>
-            <!--field name="perm_write">True</field>
-            <field name="perm_create">True</field>
-            <field name="perm_unlink">True</field-->
-        </record>
-        
-        <record id="portal_account_invoice_access_right" model="ir.model.access">
-            <field name="name">Account Invoice</field>
-            <field ref="account.model_account_invoice" name="model_id"/>
-            <field name="perm_read">True</field>
-            <!--field name="perm_write">True</field>
-            <field name="perm_create">True</field>
-            <field name="perm_unlink">True</field-->
-        </record>
-        
-        <record id="portal_account_invoice_line_access_right" model="ir.model.access">
-            <field name="name">Account Invoice Line</field>
-            <field ref="account.model_account_invoice_line" name="model_id"/>
-            <field name="perm_read">True</field>
-            <!--field name="perm_write">True</field>
-            <field name="perm_create">True</field>
-            <field name="perm_unlink">True</field-->
-        </record>
-        
-       <!--rules--> 
-        <record id="portal_sale_order_user_rule" model="ir.rule">
-            <field name="name">Personal Leads</field>
-            <field ref="sale.model_sale_order" name="model_id"/>
-            <field name="domain_force">['|',('partner_id.email','=',user.login),('user_id','=',False)]</field>
-            <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
-        </record>
-        
-        <record id="portal_stock_picking_user_rule" model="ir.rule">
-            <field name="name">Personal Leads</field>
-            <field ref="stock.model_stock_picking" name="model_id"/>
-            <field name="domain_force">[('partner_id.email','=',user.login)]</field>
-            <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
-        </record>
-        
-        <record id="portal_account_invoice_user_rule" model="ir.rule">
-            <field name="name">Personal Leads</field>
-            <field ref="account.model_account_invoice" name="model_id"/>
-            <field name="domain_force">[('partner_id.email','=',user.login)]</field>
-            <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
-        </record>
-
-       <!-- I create a portal with rules and acces right--> 
-        
-        <record id="res_portal_demo" model="res.portal">
-            <field name="name">Sales Portal</field>
-            <!-- give access to customer portal menu-->
-            <field name="menu_access" eval="[(4, ref('customer_portal'))]"/>
-            <!--give rules-->
-            <field name="rule_groups" eval="[(4, ref('portal_sale_order_user_rule')), (4, ref('portal_stock_picking_user_rule')), (4, ref('portal_account_invoice_user_rule'))]"/>
-            <!-- give access rights-->
-            <field name="model_access" eval="[(6,0,[ref('portal_sale_order_access_right'), ref('portal_sale_order_line_access_right'), ref('portal_stock_picking_access_right'), ref('portal_account_invoice_access_right'), ref('portal_account_invoice_line_access_right')])]"/>
-        </record>
-        
-    </data>
-    
-</openerp>
diff --git a/addons/portal_customer_claim/__openerp__.py b/addons/portal_customer_claim/__openerp__.py
index e6a89ed3a21..ad41bc53786 100644
--- a/addons/portal_customer_claim/__openerp__.py
+++ b/addons/portal_customer_claim/__openerp__.py
@@ -31,6 +31,7 @@
     'author': 'OpenERP SA',
     'depends': ['crm_claim','portal_customer'],
     'update_xml': [
+        'security/portal_customer_security.xml',
         'portal_customer_claim_view.xml',
         "security/ir.model.access.csv",
     ],
diff --git a/addons/portal_customer_claim/security/portal_customer_security.xml b/addons/portal_customer_claim/security/portal_customer_security.xml
new file mode 100644
index 00000000000..d3709b755a5
--- /dev/null
+++ b/addons/portal_customer_claim/security/portal_customer_security.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+      
+        <record id="portal_stock_picking_user_rule" model="ir.rule">
+            <field name="name">Personal Claims</field>
+            <field ref="crm_claim.model_crm_claim" name="model_id"/>
+            <field name="domain_force">[('partner_id.email','=',user.login)]</field>
+            <field name="groups" eval="[(4, ref('portal_customer.group_sales_portal'))]"/>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/portal_customer_event/__openerp__.py b/addons/portal_customer_event/__openerp__.py
index ee531816b44..21f6b62c2e8 100644
--- a/addons/portal_customer_event/__openerp__.py
+++ b/addons/portal_customer_event/__openerp__.py
@@ -31,6 +31,7 @@
     'author': 'OpenERP SA',
     'depends': ['event','portal_customer'],
     'update_xml': [
+        'security/portal_customer_security.xml',
         'portal_customer_event_view.xml',
         'security/ir.model.access.csv',
     ],
diff --git a/addons/portal_customer_event/security/portal_customer_security.xml b/addons/portal_customer_event/security/portal_customer_security.xml
new file mode 100644
index 00000000000..fe04832fe10
--- /dev/null
+++ b/addons/portal_customer_event/security/portal_customer_security.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+      
+        <record id="portal_event_rule" model="ir.rule">
+            <field name="name">Personal Events</field>
+            <field ref="event.model_event_event" name="model_id"/>
+            <field name="domain_force">[('partner_id.email','=',user.login)]</field>
+            <field name="groups" eval="[(4, ref('portal_customer.group_sales_portal'))]"/>
+        </record>
+        
+        <record id="portal_registration_rule" model="ir.rule">
+            <field name="name">Personal Events</field>
+            <field ref="event.model_event_registration" name="model_id"/>
+            <field name="domain_force">[('partner_id.email','=',user.login)]</field>
+            <field name="groups" eval="[(4, ref('portal_customer.group_sales_portal'))]"/>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/portal_customer_issue/__openerp__.py b/addons/portal_customer_issue/__openerp__.py
index 90fd21b622b..eae8b8ba9ea 100644
--- a/addons/portal_customer_issue/__openerp__.py
+++ b/addons/portal_customer_issue/__openerp__.py
@@ -31,6 +31,7 @@
     'author': 'OpenERP SA',
     'depends': ['project_issue','portal_customer'],
     'update_xml': [
+        'security/portal_customer_security.xml',
         'security/ir.model.access.csv',
         'portal_customer_issue_view.xml',
     ],
diff --git a/addons/portal_customer_issue/security/portal_customer_security.xml b/addons/portal_customer_issue/security/portal_customer_security.xml
new file mode 100644
index 00000000000..465cdee67b6
--- /dev/null
+++ b/addons/portal_customer_issue/security/portal_customer_security.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+      
+        <record id="portal_issue_rule" model="ir.rule">
+            <field name="name">Personal Issues</field>
+            <field ref="project_issue.model_project_issue" name="model_id"/>
+            <field name="domain_force">[('partner_id.email','=',user.login)]</field>
+            <field name="groups" eval="[(4, ref('portal_customer.group_sales_portal'))]"/>
+        </record>
+        <record id="portal_task_rule" model="ir.rule">
+            <field name="name">Personal Task</field>
+            <field ref="project.model_project_task" name="model_id"/>
+            <field name="domain_force">[('partner_id.email','=',user.login)]</field>
+            <field name="groups" eval="[(4, ref('portal_customer.group_sales_portal'))]"/>
+        </record>
+    </data>
+</openerp>