diff --git a/openerp/addons/base/res/res_security.xml b/openerp/addons/base/res/res_security.xml
index 6a2bf52d21b..f02abd90985 100644
--- a/openerp/addons/base/res/res_security.xml
+++ b/openerp/addons/base/res/res_security.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data noupdate="0">
 
-    <record model="res.groups" id="group_partner_manager" context="{'noadmin':True}">
+    <record model="res.groups" id="group_partner_manager">
         <field name="name">Partner Manager</field>
     </record>
 
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index c12ca8f8f19..4b8fb330a78 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -97,22 +97,6 @@ class groups(osv.osv):
         self.pool.get('ir.model.access').call_cache_clearing_methods(cr)
         return res
 
-    def create(self, cr, uid, vals, context=None):
-        if 'name' in vals:
-            if vals['name'].startswith('-'):
-                raise osv.except_osv(_('Error'),
-                        _('The name of the group can not start with "-"'))
-        gid = super(groups, self).create(cr, uid, vals, context=context)
-        if context and context.get('noadmin', False):
-            pass
-        else:
-            # assign this new group to user_root
-            user_obj = self.pool.get('res.users')
-            aid = user_obj.browse(cr, 1, user_obj._get_admin_id(cr))
-            if aid:
-                aid.write({'groups_id': [(4, gid)]})
-        return gid
-
     def get_extended_interface_group(self, cr, uid, context=None):
         data_obj = self.pool.get('ir.model.data')
         extended_group_data_id = data_obj._get_id(cr, uid, 'base', 'group_extended')
diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml
index b41f87c72da..3b0194922ca 100644
--- a/openerp/addons/base/security/base_security.xml
+++ b/openerp/addons/base/security/base_security.xml
@@ -12,28 +12,30 @@
     <record model="res.groups" id="group_system">
         <field name="name">Configuration</field>
         <field name="implied_ids" eval="[(4, ref('group_erp_manager'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
     <record model="res.groups" id="group_user">
         <field name="name">Employee</field>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
-    <record model="res.groups" context="{'noadmin':True}" id="group_multi_company">
+    <record model="res.groups" id="group_multi_company">
         <field name="name">Multi Companies</field>
     </record>
 
-    <record model="res.groups" context="{'noadmin':True}" id="group_extended">
+    <record model="res.groups" id="group_extended">
         <field name="name">Extended View</field>
     </record>
 
-    <record model="res.groups" id="group_no_one" context="{'noadmin':True}">
+    <record model="res.groups" id="group_no_one">
         <field name="name">Technical Features</field>
     </record>
 
-    <record id="group_sale_salesman" context="{'noadmin':True}" model="res.groups">
+    <record id="group_sale_salesman" model="res.groups">
         <field name="name">User</field>
     </record>
-    <record id="group_sale_manager" context="{'noadmin':True}" model="res.groups">
+    <record id="group_sale_manager" model="res.groups">
         <field name="name">Manager</field>
         <field name="implied_ids" eval="[(4, ref('group_sale_salesman'))]"/>
     </record>