diff --git a/bin/addons/base/__terp__.py b/bin/addons/base/__terp__.py
index b1e4693ae81..6a3929b497c 100644
--- a/bin/addons/base/__terp__.py
+++ b/bin/addons/base/__terp__.py
@@ -35,8 +35,9 @@
 	"depends" : [],
 	"init_xml" : [
 		"base_data.xml",
-		"base_security.xml",
 		"base_menu.xml",
+		"base_security.xml",
+		"res/res_security.xml",
 	],
 	"demo_xml" : [
 		"base_demo.xml",
diff --git a/bin/addons/base/base_security.xml b/bin/addons/base/base_security.xml
index 82ab0b89ee0..c7651e1e0ec 100644
--- a/bin/addons/base/base_security.xml
+++ b/bin/addons/base/base_security.xml
@@ -25,6 +25,8 @@
                 <separator col="4" colspan="4" string="Set password to the root user"/>
                 <newline/>
                 <field name="password"/>
+                <newline/>
+                <field name="password_check"/>
                 <group col="4" colspan="4">
                     <button icon="gtk-cancel" name="action_cancel" type="object" string="Cancel" special="cancel"/>
                     <button icon="gtk-ok" name="action_update_pw" type="object" string="Update"/>
@@ -79,57 +81,11 @@
 <!--
  Objects Groups
 -->
-<!-- No XML-ID's -->
-    <!--<record model="ir.model" id="base.model_ir_model">-->
-    <!--    <field name="model" model="ir.model" search="[('model', '=', 'ir.actions.act_window')]"/>-->
-    <!--    <field name="type">system</field>-->
-    <!--</record>-->
-    
-    <!--<record model="ir.model" id="base.model_ir_model_custom">-->
-    <!--    <field name="type">system</field>-->
-    <!--</record>-->
-    
-    <!--<record model="ir.model" id="base.model_ir_model_custom_fields">-->
-    <!--    <field name="type">system</field>-->
-    <!--</record>-->
-    
-    <!--<record model="ir.model" id="base.model_ir_module_module_configuration">-->
-    <!--    <field name="type">system</field>-->
-    <!--</record>-->
-    
-<!-- Base -->
-    <record model="ir.model" id="base.model_res_bank">
-        <field name="type">base</field>
-    </record>
-    
-    <record model="ir.model" id="base.model_res_payterm">
-        <field name="type">base</field>
-    </record>
-    
-    <record model="ir.model" id="base.model_res_currency">
-        <field name="type">base</field>
-    </record>
-    
-    <record model="ir.model" id="base.model_res_currency_rate">
-        <field name="type">base</field>
-    </record>
-    
-    <record model="ir.model" id="base.model_res_company">
-        <field name="type">base</field>
-    </record>
-    
-    <record model="ir.model" id="base.model_res_groups">
-        <field name="type">base</field>
-    </record>
-    
-    <record model="ir.model" id="base.model_res_roles">
-        <field name="type">base</field>
-    </record>
     
 <!-- System -->
-    <record model="ir.model" id="base.model_ir_actions">
-        <field name="type">system</field>
-    </record>
+    <!--<record model="ir.model" id=".model_ir_actions">-->
+    <!--    <field name="type">system</field>-->
+    <!--</record>-->
     
     <record model="ir.model" id="base.model_ir_act_report_custom">
         <field name="type">system</field>
@@ -171,10 +127,6 @@
         <field name="type">system</field>
     </record>
 
-    <record model="ir.model" id="base.model_res_users">
-        <field name="type">system</field>
-    </record>
-
     <record model="ir.model" id="base.model_ir_report_custom">
         <field name="type">system</field>
     </record>
diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index 21c81e210f1..4be97e15c56 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -518,6 +518,7 @@ class ir_model_config(osv.osv):
     _name = 'ir.model.config'
     _columns = {
         'password': fields.char('Password', size=64, invisible=True),
+        'password_check': fields.char('  confirmation', size=64, invisible=True),
     }
 
     def action_cancel(self, cr, uid, ids, context={}):
@@ -533,12 +534,15 @@ class ir_model_config(osv.osv):
         res = self.read(cr,uid,ids)[0]
         root = self.pool.get('res.users').browse(cr, uid, [1])[0]
         self.unlink(cr, uid, [res['id']])
-        self.pool.get('res.users').write(cr, uid, [root.id], {'password':res['password']})
-        return {
-            'view_type': 'form',
-            "view_mode": 'form',
-            'res_model': 'ir.module.module.configuration.wizard',
-            'type': 'ir.actions.act_window',
-            'target':'new',
-        }
+        if res['password']==res['password_check']:
+            self.pool.get('res.users').write(cr, uid, [root.id], {'password':res['password']})
+            return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'ir.module.module.configuration.wizard',
+                'type': 'ir.actions.act_window',
+                'target':'new',
+            }
+        else:
+            raise except_orm(_('Error'), _("Password mismatch !"))
 ir_model_config()
diff --git a/bin/addons/base/res/res_security.xml b/bin/addons/base/res/res_security.xml
new file mode 100644
index 00000000000..adcf182f0c6
--- /dev/null
+++ b/bin/addons/base/res/res_security.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0"?>
+<terp>
+<data noupdate="1">
+
+<!--
+ Users
+-->
+
+<!--
+ Users Groups
+-->
+
+<!--
+ Objects Groups
+-->
+
+<!-- System -->
+    <record model="ir.model" id="base.model_res_users">
+        <field name="type">system</field>
+    </record>
+    
+    <record model="ir.model" id="base.model_res_groups">
+        <field name="type">system</field>
+    </record>
+    
+    <record model="ir.model" id="base.model_res_roles">
+        <field name="type">system</field>
+    </record>
+
+<!-- Base -->
+    <record model="ir.model" id="base.model_res_bank">
+        <field name="type">base</field>
+    </record>
+    
+    <record model="ir.model" id="base.model_res_payterm">
+        <field name="type">base</field>
+    </record>
+    
+    <record model="ir.model" id="base.model_res_currency">
+        <field name="type">base</field>
+    </record>
+    
+    <record model="ir.model" id="base.model_res_currency_rate">
+        <field name="type">base</field>
+    </record>
+    
+    <record model="ir.model" id="base.model_res_company">
+        <field name="type">base</field>
+    </record>
+    
+    <record model="ir.model" id="base.model_res_partner">
+        <field name="type">base</field>
+    </record>
+    
+    <record model="ir.model" id="base.model_res_partner">
+        <field name="type">base</field>
+    </record>
+    
+    <record model="ir.model" id="base.model_res_partner_function">
+        <field name="type">base</field>
+    </record>
+    
+    <record model="ir.model" id="base.model_res_partner_title">
+        <field name="type">base</field>
+    </record>
+    
+    <record model="ir.model" id="base.model_res_partner_bank">
+        <field name="type">base</field>
+    </record>
+    
+    <record model="ir.model" id="base.model_res_partner_bank_type">
+        <field name="type">base</field>
+    </record>
+    
+    <record model="ir.model" id="base.model_res_partner_bank_type_field">
+        <field name="type">base</field>
+    </record>
+    
+    <record model="ir.model" id="base.model_res_partner_som">
+        <field name="type">base</field>
+    </record>
+    
+    <record model="ir.model" id="base.model_res_partner_event">
+        <field name="type">base</field>
+    </record>
+    
+    <record model="ir.model" id="base.model_res_partner_event_type">
+        <field name="type">base</field>
+    </record>
+    
+    <record model="ir.model" id="base.model_res_partner_category">
+        <field name="type">base</field>
+    </record>
+
+<!--
+ Access
+-->
+
+</data>
+</terp>