diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index 429d8c08c1d..36c65278d18 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -68,25 +68,6 @@ Administrator</span>]]></field>
             <field eval="10" name="sequence"/>
         </record>
 
-        <!--
-            A group dedicated to the portal users, making groups
-            restrictions more convenient.
-        -->
-        <record id="group_portal" model="res.groups">
-            <field name="name">Portal</field>
-            <field name="comment">Portal members have specific access rights (such as record rules and restricted menus).
-                They usually do not belong to the usual Odoo groups.</field>
-        </record>
-        <!--
-            A group dedicated to the public user only, making groups
-            restrictions more convenient.
-        -->
-        <record id="group_public" model="res.groups">
-            <field name="name">Public</field>
-            <field name="comment">Public users have specific access rights (such as record rules and restricted menus).
-                They usually do not belong to the usual Odoo groups.</field>
-        </record>
-
         <!-- Basic fonts family included in PDF standart, will always be in the font list -->
         <record model="res.font" id="base.font_helvetica">
             <field name="name">Helvetica</field>
@@ -117,7 +98,7 @@ Administrator</span>]]></field>
             <field name="login">public</field>
             <field name="password"></field>
             <!-- Avoid auto-including this demo user in any default group -->
-            <field name="groups_id" eval="[(6,0,[ref('base.group_public')])]"/>
+            <field name="groups_id" eval="[(6,0,[])]"/>
             <field name="image" type="base64" file="base/static/img/public_user-image.png"/>
             <field name="partner_id" ref="public_partner"/>
             <field name="active" eval="False"/>
diff --git a/openerp/addons/base/module/module_data.xml b/openerp/addons/base/module/module_data.xml
index 72a2b43e38b..f091dd0bb1a 100644
--- a/openerp/addons/base/module/module_data.xml
+++ b/openerp/addons/base/module/module_data.xml
@@ -7,7 +7,6 @@
             <field name="visible" eval="0" />
         </record>
 
-
         <record model="ir.module.category" id="module_category_localization">
             <field name="name">Localization</field>
             <field name="visible" eval="0" />
@@ -19,12 +18,6 @@
             <field name="visible" eval="0" />
         </record>
 
-        <record model="ir.module.category" id="module_category_customer_relationship_management">
-            <field name="name">Customer Relationship Management</field>
-            <field name="description">Manage relations with prospects and customers using leads, opportunities, requests or issues.</field>
-            <field name="sequence">1</field>
-        </record>
-
         <record model="ir.module.category" id="module_category_sales_management">
             <field name="name">Sales</field>
             <field name="description">Helps you handle your quotations, sale orders and invoicing.</field>
@@ -37,14 +30,8 @@
             <field name="sequence">3</field>
         </record>
 
-        <record model="ir.module.category" id="module_category_knowledge_management">
-            <field name="name">Knowledge</field>
-            <field name="description">Lets you install addons geared towards sharing knowledge with and between your employees.</field>
-            <field name="sequence">4</field>
-        </record>
-
         <record model="ir.module.category" id="module_category_warehouse_management">
-            <field name="name">Warehouse</field>
+            <field name="name">Inventory</field>
             <field name="description">Helps you manage your inventory and main stock operations: delivery orders, receptions, etc.</field>
             <field name="sequence">5</field>
         </record>
@@ -97,12 +84,6 @@
             <field name="sequence">13</field>
         </record>
 
-        <record model="ir.module.category" id="module_category_report_designer">
-            <field name="name">Advanced Reporting</field>
-            <field name="description">Lets you install various tools to simplify and enhance Odoo's report creation.</field>
-            <field name="sequence">14</field>
-        </record>
-
         <record model="ir.module.category" id="module_category_specific_industry_applications">
             <field name="name">Specific Industry Applications</field>
             <field name="sequence">15</field>
@@ -124,10 +105,15 @@
         </record>
 
         <record model="ir.module.category" id="module_category_usability">
-            <field name="name">Usability</field>
+            <field name="name">Extra Rights</field>
             <field name="sequence">101</field>
         </record>
 
+        <record model="ir.module.category" id="module_category_extra">
+            <field name="name">Other Extra Rights</field>
+            <field name="sequence">102</field>
+        </record>
+
         <!-- add applications to base groups -->
         <record model="res.groups" id="group_configuration">
             <field name="category_id" ref="module_category_administration"/>
@@ -158,9 +144,22 @@
         <record model="res.groups" id="group_sale_salesman">
             <field name="category_id" ref="module_category_sales_management"/>
         </record>
+
         <record model="res.groups" id="group_sale_manager">
             <field name="category_id" ref="module_category_sales_management"/>
         </record>
 
+        <record id="group_portal" model="res.groups">
+            <field name="category_id" ref="module_category_extra"/>
+        </record>
+
+        <record id="group_public" model="res.groups">
+            <field name="category_id" ref="module_category_extra"/>
+        </record>
+
+        <record id="group_partner_manager" model="res.groups">
+            <field name="category_id" ref="module_category_extra"/>
+        </record>
+
     </data>
 </openerp>
diff --git a/openerp/addons/base/res/res_security.xml b/openerp/addons/base/res/res_security.xml
index 1eeb95161ec..a5f7550492c 100644
--- a/openerp/addons/base/res/res_security.xml
+++ b/openerp/addons/base/res/res_security.xml
@@ -2,10 +2,6 @@
 <openerp>
     <data noupdate="1">
 
-        <record model="res.groups" id="group_partner_manager">
-            <field name="name">Contact Creation</field>
-        </record>
-
         <record model="ir.ui.menu" id="menu_config_address_book">
             <field name="name">Contacts</field>
             <field eval="[(6,0,[ref('group_system'), ref('group_partner_manager')])]" name="groups_id"/>
diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml
index d55d2c54d36..4a3c779bf1f 100644
--- a/openerp/addons/base/security/base_security.xml
+++ b/openerp/addons/base/security/base_security.xml
@@ -14,6 +14,7 @@
             <field name="name">Access Rights</field>
             <field name="implied_ids" eval="[(4, ref('group_configuration'))]"/>
         </record>
+
         <record model="res.groups" id="group_system">
             <field name="name">Settings</field>
             <field name="implied_ids" eval="[(4, ref('group_erp_manager'))]"/>
@@ -40,11 +41,39 @@
         <record id="group_sale_salesman" model="res.groups">
             <field name="name">User</field>
         </record>
+
         <record id="group_sale_manager" model="res.groups">
             <field name="name">Manager</field>
             <field name="implied_ids" eval="[(4, ref('group_sale_salesman'))]"/>
         </record>
 
+        <record model="res.groups" id="group_partner_manager">
+            <field name="name">Contact Creation</field>
+        </record>
+
+        <!--
+            A group dedicated to the portal users, making groups
+            restrictions more convenient.
+        -->
+        <record id="group_portal" model="res.groups">
+            <field name="name">Portal</field>
+            <field name="comment">Portal members have specific access rights (such as record rules and restricted menus).
+                They usually do not belong to the usual Odoo groups.</field>
+        </record>
+        <!--
+            A group dedicated to the public user only, making groups
+            restrictions more convenient.
+        -->
+        <record id="group_public" model="res.groups">
+            <field name="name">Public</field>
+            <field name="comment">Public users have specific access rights (such as record rules and restricted menus).
+                They usually do not belong to the usual Odoo groups.</field>
+        </record>
+
+        <record id="public_user" model="res.users">
+            <field name="groups_id" eval="[(6,0,[ref('base.group_public')])]"/>
+        </record>
+
         <record model="ir.rule" id="res_partner_rule">
             <field name="name">res.partner company</field>
             <field name="model_id" ref="model_res_partner"/>