diff --git a/bin/addons/base/__openerp__.py b/bin/addons/base/__openerp__.py
index 5f7fade6309..47a36987b48 100644
--- a/bin/addons/base/__openerp__.py
+++ b/bin/addons/base/__openerp__.py
@@ -52,7 +52,7 @@
         'module/wizard/base_language_install_view.xml',
         'module/wizard/base_import_language_view.xml',
         'module/wizard/base_module_upgrade_view.xml',
-        #TODO: 'module/wizard/base_module_configuration_view.xml',
+        'module/wizard/base_module_configuration_view.xml',
         'module/wizard/base_export_language_view.xml',
         'module/wizard/base_update_translations_view.xml',
         'res/res_request_view.xml',
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index eac674f3e77..76f3ca3fdf2 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1908,9 +1908,6 @@
                     <field name="action_id"/>
                     <field name="state" readonly="1"/>
                     <button name="action_launch" states="open" string="Launch" type="object" icon="gtk-execute" help="Launch Configuration Wizard"/>
-                    <button name="action_open" states="cancel,skip,done"
-                            string="Todo" type="object" help="Set as Todo"
-                            icon="gtk-convert"/>
                 </tree>
             </field>
         </record>
diff --git a/bin/addons/base/module/wizard/__init__.py b/bin/addons/base/module/wizard/__init__.py
index 76e7b329331..f7bb6924766 100644
--- a/bin/addons/base/module/wizard/__init__.py
+++ b/bin/addons/base/module/wizard/__init__.py
@@ -27,7 +27,6 @@ import base_module_update
 import base_language_install
 import base_import_language
 import base_module_upgrade
-import base_module_configuration
 import base_export_language
 import base_update_translations
 
diff --git a/bin/addons/base/module/wizard/base_module_configuration.py b/bin/addons/base/module/wizard/base_module_configuration.py
index 2473136501d..cb3a89eeb3e 100644
--- a/bin/addons/base/module/wizard/base_module_configuration.py
+++ b/bin/addons/base/module/wizard/base_module_configuration.py
@@ -19,16 +19,5 @@
 #
 ##############################################################################
 
-import pooler
-from osv import osv, fields
-
-class base_module_configuration(osv.osv_memory):
-
-     _name = "base.module.configuration"
-
-     def config(self, cr, uid, data, context=None):
-        return self.pool.get('res.config').next(cr, uid, [], context=context)
-
-base_module_configuration()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/bin/addons/base/module/wizard/base_module_configuration_view.xml b/bin/addons/base/module/wizard/base_module_configuration_view.xml
index 05190133801..09f844af9eb 100644
--- a/bin/addons/base/module/wizard/base_module_configuration_view.xml
+++ b/bin/addons/base/module/wizard/base_module_configuration_view.xml
@@ -2,35 +2,28 @@
 <openerp>
     <data>
 
-       <record id="view_base_module_configuration" model="ir.ui.view">
-            <field name="name">Module Configuration</field>
-            <field name="model">base.module.configuration</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-            <form string="">
-             </form>
-            </field>
+
+        <record id="action_start_configurator" model="ir.actions.server">
+            <field name="name">Start Configuration</field>
+            <field name="model_id" ref="model_res_config"/>
+            <field name="state">code</field>
+            <field name="code">action = obj.start([])</field>
         </record>
 
-        <record id="action_view_base_module_configuration" model="ir.actions.act_window">
-            <field name="name">Module Configuration</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">base.module.configuration</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
+        <menuitem name="Start Configuration"
+            action="action_start_configurator"
+            id="menu_view_base_module_configuration" parent="next_id_11"
+            type="server" icon="STOCK_EXECUTE" sequence="2" />
+
+        <record model="ir.values" id="action_todo_config">
+            <field name="model_id" ref="model_ir_actions_todo" />
+            <field name="object" eval="1" />
+            <field name="name">Start Configuration</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.server,' + str(ref('action_start_configurator'))" />
+            <field name="key">action</field>
+            <field name="model">ir.actions.todo</field>
         </record>
-
-         <menuitem
-        name="Start Configuration"
-        action="action_view_base_module_configuration"
-        id="menu_view_base_module_configuration"
-       parent="next_id_11"
-       sequence="2"/>
-
-         <act_window id="action_view_base_module_configuration_window"
-            key2="client_action_multi" name="Start Configuration"
-            res_model="base.module.configuration" src_model="ir.module.module"
-            view_mode="form" target="new" view_type="form" />
+    
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/bin/addons/base/module/wizard/wizard_configuration.py b/bin/addons/base/module/wizard/wizard_configuration.py
index e720ba419b0..bae14966ab2 100644
--- a/bin/addons/base/module/wizard/wizard_configuration.py
+++ b/bin/addons/base/module/wizard/wizard_configuration.py
@@ -38,5 +38,6 @@ class wizard_configuration(wizard.interface):
         }
     }
 wizard_configuration('module.configuration')
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: