diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 8861a5b6bb8..5016f81a17f 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -137,6 +137,7 @@ class gamification_goal(osv.Model):
             type='float',
             string='Completeness'),
         'state': fields.selection([
+                ('draft', 'Draft'),
                 ('inprogress', 'In progress'),
                 ('inprogress_update', 'In progress (to update)'),
                 ('reached', 'Reached'),
@@ -158,7 +159,7 @@ class gamification_goal(osv.Model):
 
     _defaults = {
         'current': 0,
-        'state': 'inprogress',
+        'state': 'draft',
         'start_date': fields.date.today,
         'last_update': fields.date.today,
     }
@@ -259,6 +260,7 @@ class gamification_goal(osv.Model):
             'planline_id':planline_id,
             'user_id':user_id,
             'target_goal':planline.target_goal,
+            'state':'inprogress',
         }
 
         if start_date:
diff --git a/addons/gamification/view/goal.xml b/addons/gamification/view/goal.xml
index b871fd9cbf1..926d02f9c71 100644
--- a/addons/gamification/view/goal.xml
+++ b/addons/gamification/view/goal.xml
@@ -49,13 +49,13 @@
                     <sheet>
                         <group>
                             <group string="Reference">
-                                <field name="type_id" on_change="on_change_type_id(type_id)" />
-                                <field name="user_id"/>
-                                <field name="planline_id" groups="base.group_no_one"/>
+                                <field name="type_id" on_change="on_change_type_id(type_id)" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="planline_id" groups="base.group_no_one"  attrs="{'readonly':[('state','!=','draft')]}"/>
                             </group>
                             <group string="Schedule">
-                                <field name="start_date"/>
-                                <field name="end_date"/>
+                                <field name="start_date" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="end_date" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <field name="computation_mode" invisible="1"/>
 
                                 <label for="remind_update_delay" attrs="{'invisible':[('computation_mode','!=', 'manually')]}"/>
@@ -66,7 +66,7 @@
                                 <field name="last_update" groups="base.group_no_one"/>
                             </group>
                             <group string="Data">
-                                <field name="target_goal"/>
+                                <field name="target_goal" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <field name="current"  attrs="{'readonly':[('computation_mode','!=','manually')]}"/>
                             </group>
                         </group>