diff --git a/addons/project/project.py b/addons/project/project.py
index c6577b00e6a..b7c88f3532b 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -49,11 +49,17 @@ class project_task_type(osv.osv):
         'fold': fields.boolean('Hide in views if empty',
                         help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."),
     }
+    def _get_default_project_id(self, cr, uid, ctx={}):
+        proj = ctx.get('default_project_id', False)
+        if type(proj) is int:
+            return [proj]
+        return proj
     _defaults = {
         'sequence': 1,
         'state': 'open',
         'fold': False,
         'case_default': True,
+        'project_ids': _get_default_project_id
     }
     _order = 'sequence'
 
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index ee887c2728c..f5fbf878fd0 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -36,7 +36,11 @@
             <field name="user_id" ref="base.user_demo"/>
             <field name="description">Implement new website for Sale and Warehouse Management for a customer.</field>
             <field name="alias_model">project.task</field>
-            <field name="type_ids" eval="[(6, 0, [ref('project_tt_analysis'),ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_deployment')])]"/>
+        </record>
+
+        <!-- We assign after so that default values applies -->
+        <record id="project_project_1" model="project.project">
+            <field name="type_ids" eval="[(4, ref('project_tt_analysis')) ,(4,ref('project_tt_specification')), (4,ref('project_tt_development')), (4,ref('project_tt_testing')), (4,ref('project_tt_deployment'))]"/>
         </record>
 
         <record id="project_project_2" model="project.project">
@@ -45,7 +49,11 @@
             <field name="privacy_visibility">public</field>
             <field name="user_id" ref="base.user_demo"/>
             <field name="alias_model">project.task</field>
-            <field name="type_ids" eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_merge'),ref('project_tt_deployment')])]"/>
+        </record>
+
+        <!-- We assign after so that default values applies -->
+        <record id="project_project_2" model="project.project">
+            <field name="type_ids" eval="[(4, ref('project_tt_specification')),(4,ref('project_tt_development')),(4,ref('project_tt_testing')),(4,ref('project_tt_merge')),(4,ref('project_tt_deployment'))]"/>
         </record>
 
         <record id="project_project_3" model="project.project">
@@ -55,10 +63,11 @@
             <field name="user_id" ref="base.user_demo"/>
             <field name="alias_model">project.task</field>
             <field name="privacy_visibility">public</field>
-            <field name="members" eval="[(6, 0, [
-                    ref('base.user_root'),
-                    ref('base.user_demo')])]"/>
-            <field name="type_ids" eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_merge'),ref('project_tt_deployment')])]"/>
+            <field name="members" eval="[(4, ref('base.user_root')), (4, ref('base.user_demo'))]"/>
+        </record>
+
+        <record id="project_project_3" model="project.project">
+            <field name="type_ids" eval="[(4, ref('project_tt_specification')),(4,ref('project_tt_development')),(4,ref('project_tt_testing')),(4,ref('project_tt_merge')),(4,ref('project_tt_deployment'))]"/>
         </record>
 
         <record id="project_project_4" model="project.project">
@@ -67,10 +76,11 @@
             <field name="name">Website Design Templates</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="alias_model">project.task</field>
-            <field name="type_ids" eval="[(6, 0, [ref('project_tt_design'),ref('project_tt_development'),ref('project_tt_testing')])]"/>
-            <field name="members" eval="[(6, 0, [
-                    ref('base.user_root'),
-                    ref('base.user_demo')])]"/>
+            <field name="members" eval="[(4, ref('base.user_root')), (4,ref('base.user_demo'))]"/>
+        </record>
+
+        <record id="project_project_4" model="project.project">
+            <field name="type_ids" eval="[(4, ref('project_tt_design')),(4,ref('project_tt_development')),(4,ref('project_tt_testing'))]"/>
         </record>
 
         <record id="project_project_5" model="project.project">
@@ -79,12 +89,15 @@
             <field name="partner_id" ref="base.res_partner_7"/>
             <field name="name">Data Import/Export Plugin</field>
             <field name="alias_model">project.task</field>
-            <field name="type_ids" eval="[(6, 0, [ref('project_tt_development')])]"/>
             <field name="members" eval="[(6, 0, [
                     ref('base.user_root'),
                     ref('base.user_demo')])]"/>
         </record>
 
+        <record id="project_project_5" model="project.project">
+            <field name="type_ids" eval="[(4, ref('project_tt_development'))]"/>
+        </record>
+
 
         <!-- Tasks -->
         <record id="project_task_1" model="project.task">