diff --git a/CHANGELOG b/CHANGELOG
index 59570894d8..6feb117a28 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Add employee on productions for some states
 * Convert set_moves into dualmethod
 * Add reference to production record name
 * Add cron task to update production cost
diff --git a/production.py b/production.py
index 2e421e68ad..b467f83e32 100644
--- a/production.py
+++ b/production.py
@@ -10,6 +10,7 @@ from trytond.pyson import Eval, Bool, If, Id
 from trytond.pool import Pool
 from trytond.transaction import Transaction
 
+from trytond.modules.company.model import employee_field, set_employee
 from trytond.modules.product import price_digits
 
 BOM_CHANGES = ['bom', 'product', 'quantity', 'uom', 'warehouse', 'location',
@@ -136,6 +137,10 @@ class Production(Workflow, ModelSQL, ModelView):
                 | ~Eval('warehouse') | ~Eval('location')),
             },
         depends=['warehouse', 'location', 'company'])
+
+    assigned_by = employee_field("Assigned By")
+    run_by = employee_field("Run By")
+    done_by = employee_field("Done By")
     state = fields.Selection([
             ('request', 'Request'),
             ('draft', 'Draft'),
@@ -631,12 +636,14 @@ class Production(Workflow, ModelSQL, ModelView):
 
     @classmethod
     @Workflow.transition('assigned')
+    @set_employee('assigned_by')
     def assign(cls, productions):
         pass
 
     @classmethod
     @ModelView.button
     @Workflow.transition('running')
+    @set_employee('run_by')
     def run(cls, productions):
         pool = Pool()
         Move = pool.get('stock.move')
@@ -649,6 +656,7 @@ class Production(Workflow, ModelSQL, ModelView):
     @classmethod
     @ModelView.button
     @Workflow.transition('done')
+    @set_employee('done_by')
     def done(cls, productions):
         pool = Pool()
         Move = pool.get('stock.move')
diff --git a/view/production_form.xml b/view/production_form.xml
index 2977a411f9..2b879683b9 100644
--- a/view/production_form.xml
+++ b/view/production_form.xml
@@ -37,6 +37,13 @@ this repository contains the full copyright notices and license terms. -->
             <field name="effective_start_date"/>
             <label name="cost"/>
             <field name="cost"/>
+            <newline/>
+            <label name="assigned_by"/>
+            <field name="assigned_by"/>
+            <label name="run_by"/>
+            <field name="run_by"/>
+            <label name="done_by"/>
+            <field name="done_by"/>
         </page>
     </notebook>
     <label name="state"/>