diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 4b903f4e454..d544a5dc091 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -94,5 +94,14 @@ class base_setup_installer(osv.osv_memory):
     _defaults = {
         'crm': True,
         }
+
+    def modules_to_install(self, cr, uid, ids, context=None):
+        modules = super(base_setup_installer, self).modules_to_install(cr, uid, ids, context=context)
+        interface_id = self.pool.get('res.config.view').search(cr, uid, [])
+        interface = self.pool.get('res.config.view').read(cr, uid, interface_id)[0]
+        modules_selected = self.read(cr, uid, ids)[0]
+        if interface.get('view', '') == 'simple' and modules_selected.get('mrp',False):
+            return modules | set(['mrp_jit'])
+        return modules
 base_setup_installer()
 
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index 3c8b62283c0..d36093c8dfb 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -12,14 +12,17 @@
           </form>
 
           <separator string="title" position="attributes">
-            <attribute name="string">Configure Your Manufacturing</attribute>
+            <attribute name="string">Manufacturing Resource Planning</attribute>
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
             <attribute name="string">After having installed the core manufacturing application, you can extend it with a few more depending on the needs of your organization</attribute>
           </xpath>
+          <xpath expr='//separator[@string="vsep"]' position='attributes'>
+      			<attribute name='rowspan'>8</attribute>
+      			<attribute name='string'></attribute>
+  		  </xpath>
           <group colspan="8">
-            <separator string="Manufacturing Resource Planning" colspan="4"/>
             <field name="stock_location"/>
             <field name="mrp_jit"/>
             <field name="mrp_operations"/>