diff --git a/fieldservice/__manifest__.py b/fieldservice/__manifest__.py
index 8b6f1a2d94..d6b0e6fba7 100644
--- a/fieldservice/__manifest__.py
+++ b/fieldservice/__manifest__.py
@@ -14,6 +14,7 @@
         'web_timeline',
         'resource',
         'contacts',
+        'partner_fax'
     ],
     'data': [
         'data/ir_sequence.xml',
diff --git a/fieldservice/models/fsm_location.py b/fieldservice/models/fsm_location.py
index ce582e8726..dacaf4f823 100644
--- a/fieldservice/models/fsm_location.py
+++ b/fieldservice/models/fsm_location.py
@@ -344,6 +344,16 @@ def _check_location_recursion(self):
             raise ValidationError(_('You cannot create recursive location.'))
         return True
 
+    @api.onchange('country_id')
+    def _onchange_country_id(self):
+        if self.country_id and self.country_id != self.state_id.country_id:
+            self.state_id = False
+
+    @api.onchange('state_id')
+    def _onchange_state(self):
+        if self.state_id.country_id:
+            self.country_id = self.state_id.country_id
+
 
 class FSMPerson(models.Model):
     _inherit = 'fsm.person'
diff --git a/fieldservice/views/fsm_location.xml b/fieldservice/views/fsm_location.xml
index 2ce8082320..e9c9a96318 100644
--- a/fieldservice/views/fsm_location.xml
+++ b/fieldservice/views/fsm_location.xml
@@ -74,6 +74,9 @@
                             <field name="owner_id"/>
                             <field name="customer_id"/>
                             <field name="contact_id" context="{'default_service_location_id': active_id, 'default_street': street, 'default_street2': street2, 'default_city': city, 'default_state_id': state_id, 'default_zip': zip, 'default_country_id': country_id}"/>
+                            <field name="phone" widget="phone"/>
+                            <field name="fax" widget="phone"/>
+                            <field name="email" widget="email"/>
                             <label for="street" string="Address"/>
                             <div class="o_address_format">
                                 <field name="street" placeholder="Street..." class="o_address_street"/>
@@ -89,9 +92,12 @@
                             <field name="description"/>
                             <field name="tz"/>
                             <field name="calendar_id"/>
-                            <field name="category_id" widget="many2many_tags" options="{'color_field': 'color'}"/>
+                            <field name="category_id" widget="many2many_tags" options="{'color_field': 'color'}" required="True"/>
                         </group>
                     </group>
+                    <group string="General Notes">
+                        <field name="notes" nolabel="1" widget="html"/>
+                    </group>
                     <notebook>
                         <page string="Directions">
                             <field name="direction" nolabel="1" widget="html"/>