diff --git a/CHANGELOG b/CHANGELOG
index 04c4f473a7..e519b2cdf1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Add employee on opportunities for some states
 * Add contact on opportunity
 
 Version 5.4.0 - 2019-11-04
diff --git a/opportunity.py b/opportunity.py
index 5b103a460a..c242631505 100644
--- a/opportunity.py
+++ b/opportunity.py
@@ -16,6 +16,8 @@ from trytond.pyson import Eval, In, If, Get, Bool
 from trytond.transaction import Transaction
 from trytond.pool import Pool
 
+from trytond.modules.company.model import employee_field, set_employee
+
 
 class SaleOpportunity(Workflow, ModelSQL, ModelView):
     'Sale Opportunity'
@@ -85,15 +87,6 @@ class SaleOpportunity(Workflow, ModelSQL, ModelView):
         depends=_depends_stop)
     lines = fields.One2Many('sale.opportunity.line', 'opportunity', 'Lines',
         states=_states_stop, depends=_depends_stop)
-    state = fields.Selection([
-            ('lead', "Lead"),
-            ('opportunity', "Opportunity"),
-            ('converted', "Converted"),
-            ('won', "Won"),
-            ('cancelled', "Cancelled"),
-            ('lost', "Lost"),
-            ], "State", required=True, select=True,
-        sort=False, readonly=True)
     conversion_probability = fields.Float('Conversion Probability',
         digits=(1, 4), required=True,
         domain=[
@@ -110,6 +103,18 @@ class SaleOpportunity(Workflow, ModelSQL, ModelView):
             }, depends=['state'])
     sales = fields.One2Many('sale.sale', 'origin', 'Sales')
 
+    converted_by = employee_field(
+        "Converted By", states=['converted', 'won', 'lost', 'cancelled'])
+    state = fields.Selection([
+            ('lead', "Lead"),
+            ('opportunity', "Opportunity"),
+            ('converted', "Converted"),
+            ('won', "Won"),
+            ('cancelled', "Cancelled"),
+            ('lost', "Lost"),
+            ], "State", required=True, select=True,
+        sort=False, readonly=True)
+
     del _states_start, _depends_start
     del _states_stop, _depends_stop
 
@@ -338,6 +343,7 @@ class SaleOpportunity(Workflow, ModelSQL, ModelView):
     @classmethod
     @ModelView.button
     @Workflow.transition('converted')
+    @set_employee('converted_by')
     def convert(cls, opportunities):
         pool = Pool()
         Sale = pool.get('sale.sale')
diff --git a/view/opportunity_form.xml b/view/opportunity_form.xml
index 77409075fe..806100233a 100644
--- a/view/opportunity_form.xml
+++ b/view/opportunity_form.xml
@@ -34,8 +34,11 @@ this repository contains the full copyright notices and license terms. -->
         <page string="Lead/Opportunity" id="opportunity">
             <label name="company"/>
             <field name="company"/>
+            <newline/>
             <label name="employee"/>
             <field name="employee"/>
+            <label name="converted_by"/>
+            <field name="converted_by"/>
             <label name="start_date"/>
             <field name="start_date"/>
             <label name="end_date"/>