diff --git a/addons/association/profile_association.py b/addons/association/profile_association.py
index 2b73dd69885..620d4798329 100644
--- a/addons/association/profile_association.py
+++ b/addons/association/profile_association.py
@@ -22,17 +22,16 @@
 from osv import fields, osv
 
 class profile_association_config_install_modules_wizard(osv.osv_memory):
-    _name='profile.association.config.install_modules_wizard'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
 
     _columns = {
-        'hr_expense':fields.boolean('Expenses Tracking',  help="Tracks and manages employee expenses, and can "
+        'hr_expense':fields.boolean('Resources Management:Expenses Tracking',  help="Tracks and manages employee expenses, and can "
                  "automatically re-invoice clients if the expenses are "
                  "project-related."),
         'project':fields.boolean('Project Management', 
                               help="Helps you manage your projects and tasks by tracking them, "
                  "generating plannings, etc..."),
-        'event_project':fields.boolean('Events', help="Helps you to manage and organize your events."),
+        'event_project':fields.boolean('Event Management:Events', help="Helps you to manage and organize your events."),
         'project_gtd':fields.boolean('Getting Things Done',
             help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
         'wiki': fields.boolean('Wiki', help="Lets you create wiki pages and page groups in order "
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index bc155733595..291707bc42e 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -3,56 +3,25 @@
     <data>
         <record id="view_confirm_install_module_form" model="ir.ui.view">
             <field name="name">Association Application Configuration</field>
-            <field name="model">profile.association.config.install_modules_wizard</field>
+            <field name="model">base.setup.installer</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.res_config_installer"/>
+            <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
             <field name="arch" type="xml">
               <data>
-                <form position="attributes">
-                  <attribute name="string">Association Application Configuration</attribute>
-                </form>
-                <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                    <attribute name='string'></attribute>
-                  </xpath>
-                <xpath expr="//label[@string='description']"
-                       position="attributes">
-                  <attribute name="string">Here are specific applications related to the Association Profile you selected.</attribute>
+                <xpath expr="//field[@name='product_expiry']" position="after">
+                    <newline/>
+                    <group attrs="{'invisible': [('association', '=', False)]}" colspan="4">
+                        <separator  string="Associations Details" colspan="4" />
+                    </group>
+                    <field name="project" attrs="{'invisible': [('association', '=', False)]}"/>
+                    <field name="project_gtd" attrs="{'invisible': [('association', '=', False)]}"/>
+                    <field name="wiki" attrs="{'invisible': [('association', '=', False)]}"/>
+                    <field name="event_project" attrs="{'invisible': [('association', '=', False)]}"/>
+                    <field name="hr_expense" attrs="{'invisible': [('association', '=', False)]}"/>
                 </xpath>
-                <xpath expr="//button[@string='Install Modules']" position="attributes">
-                    <attribute name="string">Configure</attribute>
-                </xpath>
-                <separator string="title" position="replace"/>
-                <group colspan="8">
-                  <separator string="Project Management" colspan="4"/>
-                  <field name="project"/>
-                  <field name="project_gtd"/>
-                  <field name="wiki"/>
-                  <separator string="Event Management" colspan="4"/>
-                  <field name="event_project"/>
-                  <separator string="Resources Management" colspan="4"/>
-                  <field name="hr_expense"/>
-                </group>
               </data>
             </field>
         </record>
-
-        <record id="action_config_install_module" model="ir.actions.act_window">
-            <field name="name">Association Application Configuration</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">profile.association.config.install_modules_wizard</field>
-            <field name="view_id" ref="view_confirm_install_module_form"/>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-      <record model="ir.actions.todo"
-            id="config_install_module">
-            <field name="action_id" ref="action_config_install_module"/>
-            <field name="sequence">3</field>
-            <field name="type">special</field>
-      </record>
-
         <menuitem
             name="Association"
             id="base.menu_association"