diff --git a/fieldservice_skill/models/fsm_order.py b/fieldservice_skill/models/fsm_order.py
index 11063a4b00..ee1662b9d1 100644
--- a/fieldservice_skill/models/fsm_order.py
+++ b/fieldservice_skill/models/fsm_order.py
@@ -1,13 +1,23 @@
 # Copyright (C) 2018, Open Source Integrators
+# Copyright (C) 2020, Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+import logging
 
 from odoo import api, fields, models
 
+_logger = logging.getLogger(__name__)
+
 
 class FSMOrder(models.Model):
     _inherit = "fsm.order"
 
     skill_ids = fields.Many2many("hr.skill", string="Required Skills")
+    skill_worker_ids = fields.Many2many(
+        "fsm.person",
+        "fsm_order_skill_workers_rel",
+        compute="_compute_skill_workers",
+        help="Available workers based on skill requirements",
+    )
 
     @api.onchange("category_ids")
     def _onchange_category_ids(self):
@@ -22,3 +32,23 @@ def _onchange_template_id(self):
         if self.template_id:
             super(FSMOrder, self)._onchange_template_id()
             self.skill_ids = self.template_id.skill_ids
+
+    @api.depends("skill_ids")
+    @api.onchange("skill_ids")
+    def _compute_skill_workers(self):
+        worker_ids = []
+        req_skills = self.skill_ids.ids
+        if not self.skill_ids:
+            worker_ids = self.env["fsm.person"].search([]).ids
+        else:
+            FPS = self.env["fsm.person.skill"]
+            potential_workers = FPS.search(
+                [("skill_id", "in", self.skill_ids.ids)]
+            ).mapped("person_id")
+            for w in potential_workers:
+                worker_skills = FPS.search([("person_id", "=", w.id)]).mapped(
+                    "skill_id"
+                )
+                if set(worker_skills.ids) >= set(req_skills):
+                    worker_ids.append(w.id)
+        self.skill_worker_ids = [(6, 0, worker_ids)]
diff --git a/fieldservice_skill/views/fsm_order.xml b/fieldservice_skill/views/fsm_order.xml
index b2cd361626..a7615b7214 100644
--- a/fieldservice_skill/views/fsm_order.xml
+++ b/fieldservice_skill/views/fsm_order.xml
@@ -12,6 +12,12 @@
                     widget="many2many_tags"
                     options="{'color_field': 'color'}"
                 />
+                <field name="skill_worker_ids" invisible="1" />
+            </field>
+            <field name="person_id" position="attributes">
+                <attribute name="domain">
+                    [("id", "in", skill_worker_ids)]
+                </attribute>
             </field>
         </field>
     </record>