diff --git a/bin/addons/base/base.sql b/bin/addons/base/base.sql
index 4d637d8350e..38e8c154a62 100644
--- a/bin/addons/base/base.sql
+++ b/bin/addons/base/base.sql
@@ -328,6 +328,6 @@ CREATE TABLE ir_model_data (
 ---------------------------------
 -- Users
 ---------------------------------
-insert into res_users (id,login,password,name,action_id,active) values (1,'root','root','Root',NULL,True);
+insert into res_users (id,login,password,name,action_id,active) values (1,'admin','admin','Administrator',NULL,True);
 insert into ir_model_data (name,module,model,noupdate,res_id) values ('user_root','base','res.users',True,1);
 select setval('res_users_id_seq', 2);
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index ffaecc9a352..9c1108de916 100755
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -49,8 +49,8 @@
             <field name="context">{'read':'default'}</field>
         </record>
         
-		<menuitem id="next_id_4" name="Low Level" parent="menu_custom"/>
-		<menuitem action="act_values_form" id="menu_values_form" parent="next_id_4"/>
+        <menuitem id="next_id_4" name="Low Level" parent="menu_custom"/>
+        <menuitem action="act_values_form" id="menu_values_form" parent="next_id_4"/>
         
         <!-- Sequences -->
         
@@ -113,7 +113,7 @@
                 </form>
             </field>
         </record>
-        	
+            
         <record id="ir_sequence_type" model="ir.actions.act_window">
             <field name="name">Sequence Types</field>
             <field name="type">ir.actions.act_window</field>
@@ -610,8 +610,8 @@
             <field name="view_id" ref="view_report_custom_form"/>
         </record>
         <!--
-	<menuitem name="Administration/Report/Report Custom" action="action_report_custom"/>
-	-->
+    <menuitem name="Administration/Report/Report Custom" action="action_report_custom"/>
+    -->
         
         <!-- model -->
         <record id="view_model_form" model="ir.ui.view">
@@ -751,7 +751,7 @@
             <field name="view_id" ref="view_model_tree"/>
         </record>
         <menuitem id="next_id_9" name="Database Structure" parent="base.menu_custom"/>
-		<menuitem action="action_model_model" id="ir_model_model_menu" parent="next_id_9"/>
+        <menuitem action="action_model_model" id="ir_model_model_menu" parent="next_id_9"/>
         
         <record id="action_model_fields" model="ir.actions.act_window">
             <field name="name">Fields</field>
@@ -811,10 +811,10 @@
         <menuitem action="action_translation_untrans" id="menu_action_translation_untrans" parent="menu_action_translation"/>
 
         <!--
-	=============================================================
-	Menu Edition
-	=============================================================
-	-->
+    =============================================================
+    Menu Edition
+    =============================================================
+    -->
         
         <record id="shortcut_form" model="ir.ui.view">
             <field name="name">ir.ui.view_sc</field>
@@ -863,8 +863,8 @@
                     <field colspan="4" name="parent_id" select="1"/>
                     <field name="action"/>
                     <field colspan="4" name="groups_id"/>
-					<field name="icon" on_change="onchange_icon(icon)"/>
-					<field name="icon_pict" widget="picture" nolabel="1"/>
+                    <field name="icon" on_change="onchange_icon(icon)"/>
+                    <field name="icon_pict" widget="picture" nolabel="1"/>
                 </form>
             </field>
         </record>
@@ -877,10 +877,10 @@
         <menuitem action="grant_menu_access" id="menu_grant_menu_access" parent="base.menu_security"/>
         
         <!--
-	=============================================================
-	Cron Jobs
-	=============================================================
-	-->
+    =============================================================
+    Cron Jobs
+    =============================================================
+    -->
         <record id="ir_cron_view_tree" model="ir.ui.view">
             <field name="name">ir.cron.tree</field>
             <field name="model">ir.cron</field>
@@ -895,7 +895,7 @@
                 </tree>
             </field>
         </record>
-        	<record id="ir_cron_view" model="ir.ui.view">
+            <record id="ir_cron_view" model="ir.ui.view">
             <field name="name">ir.cron.form</field>
             <field name="model">ir.cron</field>
             <field name="type">form</field>
@@ -936,7 +936,7 @@
             <field name="model">ir.model.access</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Access controls">
+                <tree string="Access Controls">
                     <field name="name"/>
                     <field name="model_id"/>
                     <field name="group_id"/>
@@ -952,7 +952,7 @@
             <field name="model">ir.model.access</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Access controls">
+                <form string="Access Controls">
                     <field colspan="4" name="name" select="1"/>
                     <field name="model_id" select="1"/>
                     <field name="group_id" select="1"/>
@@ -965,7 +965,7 @@
             </field>
         </record>
         <record id="ir_access_act" model="ir.actions.act_window">
-            <field name="name">Access controls List</field>
+            <field name="name">Access Controls List</field>
             <field name="res_model">ir.model.access</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="ir_access_view_tree"/>
@@ -1073,54 +1073,54 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Server Action">
-                	<field name="name" select="1"/>
+                    <field name="name" select="1"/>
                     <field name="state" select="1"/>
                     <field name="model_id" select="1"/>
                     <field name="sequence" select="2"/>
-                	<notebook colspan="4">
-                		<page string="Python Code" attrs="{'invisible':[('state','!=','python')]}">
-		                    <separator colspan="4" string="Python code"/>
-		                    <field name="code" colspan="4" nolabel="1" />
-						</page>
-						
-						<page string="Trigger" attrs="{'invisible':[('state','!=','trigger')]}">
-							<separator colspan="4" string="Trigger Configuration"/>
-		                    <field name="trigger_obj_id" select="2" colspan="4"/>
-		                    <field name="trigger_name" select="2"/>
-						</page>
-						
-						<page string="Email / SMS" attrs="{'invisible':[('state','=','python'),('state','=','dummy'),('state','=','trigger'), ('state','=','object_create'), ('state','=','object_write'), ('state','=','client_action'), ('state','=','other')]}">
-							<separator colspan="4" string="Email Configuration"/>
-							<field name="address" domain="[('model_id','=',model_id)]"/>
-							<field name="message" select="2" colspan="4" widget="html_tag"/>
-							<newline/>
-							<label colspan="4" string="Access all the fields related to the current object easily just by defining name of the attribute, i.e. [[partner_id.name]] for Invoice Object"/>
-						</page>
-						
-						<page string="Create / Write" attrs="{'invisible':[('state','=','python'),('state','=','dummy'),('state','=','trigger'), ('state','=','sms'), ('state','=','email'), ('state','=','client_action'), ('state','=','other')]}">
-							<separator colspan="4" string="Fields Mapping"/>
-							<field name="otype"/>
-							<field name="srcmodel_id" select="2" attrs="{'readonly':[('type','=','copy'),('state','=','write_create')]}"/>
-							<field name="fields_lines" nolabel="1" select="2" colspan="4">
-								<tree string="Field Mappings" editable="top">
-									<field name="col1" domain="[('model_id','=',parent.srcmodel_id or parent.model_id)]"/>
-									<field name="type"/>
-									<field name="value" colsapan="4"/>
-								</tree>
-								<form string="Field Mapping"> 
-									<field name="col1" domain="[('model_id','=',parent.srcmodel_id or parent.model_id)]"/>
-									<field name="type"/>
-									<field name="value" colsapan="4"/>
-								</form>
-							</field>
-						</page>
-						
-						<page string="Other Actions" attrs="{'invisible':[('state','!=','other')]}">
-							<separator colspan="4" string="Other Actions Configuration"/>
-                    		<field name="child_ids" nolabel="1" colspan="4" />
-						</page>
-						
-					</notebook>
+                    <notebook colspan="4">
+                        <page string="Python Code" attrs="{'invisible':[('state','!=','python')]}">
+                            <separator colspan="4" string="Python code"/>
+                            <field name="code" colspan="4" nolabel="1" />
+                        </page>
+                        
+                        <page string="Trigger" attrs="{'invisible':[('state','!=','trigger')]}">
+                            <separator colspan="4" string="Trigger Configuration"/>
+                            <field name="trigger_obj_id" select="2" colspan="4"/>
+                            <field name="trigger_name" select="2"/>
+                        </page>
+                        
+                        <page string="Email / SMS" attrs="{'invisible':[('state','=','python'),('state','=','dummy'),('state','=','trigger'), ('state','=','object_create'), ('state','=','object_write'), ('state','=','client_action'), ('state','=','other')]}">
+                            <separator colspan="4" string="Email Configuration"/>
+                            <field name="address" domain="[('model_id','=',model_id)]"/>
+                            <field name="message" select="2" colspan="4" widget="html_tag"/>
+                            <newline/>
+                            <label colspan="4" string="Access all the fields related to the current object easily just by defining name of the attribute, i.e. [[partner_id.name]] for Invoice Object"/>
+                        </page>
+                        
+                        <page string="Create / Write" attrs="{'invisible':[('state','=','python'),('state','=','dummy'),('state','=','trigger'), ('state','=','sms'), ('state','=','email'), ('state','=','client_action'), ('state','=','other')]}">
+                            <separator colspan="4" string="Fields Mapping"/>
+                            <field name="otype"/>
+                            <field name="srcmodel_id" select="2" attrs="{'readonly':[('type','=','copy'),('state','=','write_create')]}"/>
+                            <field name="fields_lines" nolabel="1" select="2" colspan="4">
+                                <tree string="Field Mappings" editable="top">
+                                    <field name="col1" domain="[('model_id','=',parent.srcmodel_id or parent.model_id)]"/>
+                                    <field name="type"/>
+                                    <field name="value" colsapan="4"/>
+                                </tree>
+                                <form string="Field Mapping"> 
+                                    <field name="col1" domain="[('model_id','=',parent.srcmodel_id or parent.model_id)]"/>
+                                    <field name="type"/>
+                                    <field name="value" colsapan="4"/>
+                                </form>
+                            </field>
+                        </page>
+                        
+                        <page string="Other Actions" attrs="{'invisible':[('state','!=','other')]}">
+                            <separator colspan="4" string="Other Actions Configuration"/>
+                            <field name="child_ids" nolabel="1" colspan="4" />
+                        </page>
+                        
+                    </notebook>
                     <field name="usage"/>
                     <field name="type"/>
                 </form>
@@ -1155,42 +1155,14 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Fields">
-                	<field name="complete_name"/>
-                	<field name="model_id"/>
+                    <field name="complete_name"/>
+                    <field name="model_id"/>
                     <field name="name"/>
                     <field name="field_description"/>
                 </tree>
             </field>
         </record>
 
-
-        <record id="ir_access_view_form" model="ir.ui.view">
-            <field name="name">ir.model.access.form</field>
-            <field name="model">ir.model.access</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Access controls">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="model_id" select="1"/>
-                    <field name="group_id" select="1"/>
-                    <newline/>
-                    <field name="perm_read"/>
-                    <field name="perm_write"/>
-                    <field name="perm_create"/>
-                    <field name="perm_unlink"/>
-                </form>
-            </field>
-        </record>
-        <record id="ir_access_act" model="ir.actions.act_window">
-            <field name="name">Access controls List</field>
-            <field name="res_model">ir.model.access</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="ir_access_view_tree"/>
-        </record>
-        <menuitem name="Access Conrols" id="menu_security_access" parent="menu_security"/>
-        <menuitem action="ir_access_act" id="menu_ir_access_act" parent="menu_security_access"/>
-
-
         <record model="ir.actions.act_window" id="action_model_grid_security">
             <field name="name">Access Controls Grid</field>
             <field name="res_model">ir.model.grid</field>