diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index d544a5dc091..1fb4a971107 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -100,8 +100,12 @@ class base_setup_installer(osv.osv_memory):
         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
+        added_modules = []
+        if interface.get('view', '') == 'simple' :
+            if modules_selected.get('mrp', False):
+                added_modules.append('mrp_jit')
+            if modules_selected.get('knowledge', False):
+                added_modules.append('document_ftp')
+        return modules | set(added_modules)
 base_setup_installer()
 
diff --git a/addons/document_ftp/document_ftp_view.xml b/addons/document_ftp/document_ftp_view.xml
index bd7571002fe..1ea96bab73a 100644
--- a/addons/document_ftp/document_ftp_view.xml
+++ b/addons/document_ftp/document_ftp_view.xml
@@ -24,10 +24,17 @@
             <form position="attributes">
               <attribute name="string">Auto Configure</attribute>
             </form>
+             <separator string="title" position="attributes">
+            	<attribute name="string">FTP Server Configuration</attribute>
+          	</separator>
+          	<xpath expr="//label[@string='description']" position="attributes">
+            <attribute name="string">Choose the address for the Document Management System's FTP server.</attribute>
+          </xpath>
+          <xpath expr='//separator[@string="vsep"]' position='attributes'>
+  				<attribute name='rowspan'>6</attribute>
+      			<attribute name='string'></attribute>
+	      	</xpath>
             <group string="res_config_contents" position="replace">
-                <separator string="FTP Server Configuration." colspan="4"/>
-                <label align="0.0" colspan="4"
-                       string="Choose the address for the Document Management System's FTP server."/>
                 <field name="host"/>
             </group>
             <xpath expr="//button[@name='action_skip']" position="replace"/>
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
index cd991ac3459..a3c9437dae1 100644
--- a/addons/knowledge/knowledge_installer.xml
+++ b/addons/knowledge/knowledge_installer.xml
@@ -13,14 +13,17 @@
 
           <separator string="title" position="attributes">
             <attribute name="string"
-                       >Configure Your Knowledge Management System</attribute>
+                       >Knowledge Management</attribute>
           </separator>
+          <xpath expr='//separator[@string="vsep"]' position='attributes'>
+      				<attribute name='rowspan'>9</attribute>
+          			<attribute name='string'></attribute>
+	      		</xpath>
           <xpath expr="//label[@string='description']"
                  position="attributes">
             <attribute name="string">From this screen, you can select various OpenERP applications which will help employees store information, distribute it and share it with one another.</attribute>
           </xpath>
           <group colspan="8">
-            <separator string="Knowledge Management" colspan="4"/>
             <field name="document_ftp"/>
             <field name="document_webdav"/>
             <field name="wiki"/>
@@ -28,6 +31,9 @@
             <field name="wiki_faq"/>
             <field name="wiki_quality_manual"/>
           </group>
+         <xpath expr="//button[@string='Install Modules']" position="attributes">
+          	<attribute name="string">Configure</attribute>
+         </xpath>
         </data>
       </field>
     </record>
@@ -45,6 +51,7 @@
     <record id="knowledge_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_knowledge_installer"/>
       <field name="sequence">3</field>
+      <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
     </record>
   </data>
 </openerp>