diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 3f04888234e..3ac95b70790 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -172,12 +172,12 @@
 
 
         <record model="ir.ui.view" id="view_users_configuration_form">
-		<field name="name">res.users.form</field>
+		<field name="name">res.users.confirm.form</field>
 		<field name="model">res.users</field>
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Configure User">
-				<separator string="Configure User"/>
+				<separator string="Configure User" colspan="4" col="4"/>
 				<newline/>
 				<notebook>
 					<page string="User">
@@ -210,18 +210,58 @@
 		<field name="type">ir.actions.act_window</field>
 		<field name="res_model">res.users</field>
 		<field name="view_type">form</field>
+		<field name="view_mode">form</field>
+		<field name="view_id" ref="view_users_configuration_form"/>
+		<field name="target">new</field>
+	</record>
+
+
+	<record model="ir.ui.view" id="view_confirm_simple_view_form">
+		<field name="name">res.users.confirm.simple_view</field>
+		<field name="model">res.config.view</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Configure simple view">
+				<separator string="If you are testing or using OpenERP for the first time, we suggest
+you to use the simplified view, which has less features but is easier
+to understand." colspan="4" col="4"/>
+				<newline/>
+				<field name="view"/>
+				<group colspan="4" col="4">
+								<button special="cancel" string="Cancel" />
+								<button name="action_set" type='object' string="Set" />
+				</group>
+
+			</form>
+		</field>
+	</record>
+
+	<record model="ir.actions.act_window" id="action_config_simple_view_form">
+		<field name="name">Configure Simple View</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="res_model">res.config.view</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">form</field>
 		<field name="target">new</field>
 	</record>
 
 
 
 	<!-- register on configuratuion -->
+
 	<record model="ir.module.module.configuration.step"
             id="config_wizard_step_user">
-            <field name="name">Configure User</field>
+            <field name="name">Create User</field>
             <field name="action_id" ref="action_config_user_form"></field>
             <field name="state">open</field>
         </record>
 
+        <record model="ir.module.module.configuration.step"
+            id="config_wizard_simple_view">
+            <field name="name">Select between the simplified views or the extended views.</field>
+            <field name="action_id" ref="action_config_simple_view_form"></field>
+            <field name="state">open</field>
+        </record>
+
 </data>
 </terp>
diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index 858b38740cb..f2f4a456243 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -601,7 +601,7 @@ class module_configuration(osv.osv_memory):
 
     _columns = {
 		'name': fields.char('Next Wizard', size=64,readonly=True),
-		'item_id':fields.many2one('ir.module.module.configuration.step', 'Next Configuration Wizard', readonly=True,required=True),
+		'item_id':fields.many2one('ir.module.module.configuration.step', 'Next Configuration Wizard', readonly=True),
 	}
     _defaults={
 		'item_id':_get_wizard
@@ -617,6 +617,7 @@ class module_configuration(osv.osv_memory):
                 }, context=context)
             return{
 				'view_type': 'form',
+				"view_mode": 'form',
 				'res_model': 'ir.module.module.configuration.wizard',
 				'type': 'ir.actions.act_window',
 				'target':'new',
diff --git a/bin/addons/base/module/module_view.xml b/bin/addons/base/module/module_view.xml
index c92614acf72..e51897e3a3e 100644
--- a/bin/addons/base/module/module_view.xml
+++ b/bin/addons/base/module/module_view.xml
@@ -244,7 +244,7 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Main Configuration wizard">
-            <separator string="Main Configuration wizard"/>
+            <separator string="Main Configuration wizard" colspan="4" col="4"/>
             <newline/>
             <field name="item_id" select="1"/>
 			<group colspan="4" col="4">
@@ -261,6 +261,7 @@
 		<field name="type">ir.actions.act_window</field>
 		<field name="res_model">ir.module.module.configuration.wizard</field>
 		<field name="view_type">form</field>
+		<field name="view_mode">form</field>
 		<field name="target">new</field>
 		</record>
 
@@ -268,13 +269,6 @@
 		name="Administration/Modules Management/Module Configuration"
 		action="action_config_wizard_form"  id="menu_config_module"/>
 
-		<!--<record model="ir.module.module.configuration.step"
-            id="config_wizard_item_module">
-            <field name="name">ir.module.module.config</field>
-            <field name="action_id" ref=""/>
-            <field name="sequence" eval="10000"/>
-            <field name="state">open</field>
-        </record>-->
 
 
 
diff --git a/bin/addons/base/module/wizard/wizard_module_upgrade.py b/bin/addons/base/module/wizard/wizard_module_upgrade.py
index 683b9eff322..896555e4832 100644
--- a/bin/addons/base/module/wizard/wizard_module_upgrade.py
+++ b/bin/addons/base/module/wizard/wizard_module_upgrade.py
@@ -81,9 +81,18 @@ class wizard_info_get(wizard.interface):
 		db, pool = pooler.restart_pool(cr.dbname, update_module=True)
 		return {}
 
+	def _config(self, cr, uid, data, context=None):
+		return {
+                'view_type': 'form',
+                "view_mode": 'form',
+				'res_model': 'ir.module.module.configuration.wizard',
+				'type': 'ir.actions.act_window',
+				'target':'new',
+         }
+
 	states = {
 		'init': {
-			'actions': [_get_install], 
+			'actions': [_get_install],
 			'result': {'type':'form', 'arch':view_form, 'fields': view_field,
 				'state':[
 					('end', 'Cancel', 'gtk-cancel'),
@@ -92,13 +101,21 @@ class wizard_info_get(wizard.interface):
 			}
 		},
 		'start': {
-			'actions': [_upgrade_module], 
+			'actions': [_upgrade_module],
 			'result': {'type':'form', 'arch':view_form_end, 'fields': {},
 				'state':[
-					('end', 'Close', 'gtk-close', True)
+					('end', 'Close', 'gtk-close', True),
+					('config', 'Start configuration', 'gtk-ok', True)
 				]
 			}
 		},
+		'config':{
+            'result': {
+                'type': 'action',
+                'action': _config,
+                'state': 'end',
+            },
+		}
 	}
 wizard_info_get('module.upgrade')
 
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 877a2b56d8b..78cfbd76db8 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -184,6 +184,7 @@ class users(osv.osv):
 	def action_create(self,cr,uid,ids,context={}):
 		return {
 			    'view_type': 'form',
+			    "view_mode": 'form',
 			    'res_model': 'ir.module.module.configuration.wizard',
 			    'type': 'ir.actions.act_window',
 			    'target':'new',
@@ -197,3 +198,35 @@ class groups2(osv.osv):
 	}
 groups2()
 
+
+class res_config_view(osv.osv_memory):
+	_name='res.config.view'
+	_columns = {
+		'name':fields.char('Name', size=64),
+		'view': fields.selection([('simple','Simple'),('extended','Extended')], 'Select between the simplified views or the extended views.', required=True ),
+
+    }
+	_defaults={
+		'view':lambda *args: 'simple',
+		}
+	def action_set(self, cr, uid, ids, context=None):
+		res=self.read(cr,uid,ids)[0]
+		users_obj = self.pool.get('res.users')
+		group_obj=self.pool.get('res.groups')
+		if 'view' in res:
+			group_ids=group_obj.search(cr,uid,[('name','=','Extended View')])
+			if group_ids and len(group_ids):
+				users_obj.write(cr, uid, [3],{
+								'groups_id':[(4,group_ids[0])]
+							}, context=context)
+		return {
+				'view_type': 'form',
+				"view_mode": 'form',
+			    'res_model': 'ir.module.module.configuration.wizard',
+			    'type': 'ir.actions.act_window',
+			    'target':'new',
+			}
+
+res_config_view()
+
+