diff --git a/client/client/src/address-edit/index.html b/client/client/src/address-edit/index.html
index c0bdf4b70..960decc4c 100644
--- a/client/client/src/address-edit/index.html
+++ b/client/client/src/address-edit/index.html
@@ -31,7 +31,7 @@
             </vn-horizontal>
             <vn-horizontal>
                 <vn-autocomplete vn-one
-                    field="addressData.address.agency"
+                    field="addressData.address.defaultAgency"
                     url="/client/api/Agencies"
                     show-field="name"
                     value-field="id"
diff --git a/services/client/common/models/Address.json b/services/client/common/models/Address.json
index 7c6d9cc09..232a51b9f 100644
--- a/services/client/common/models/Address.json
+++ b/services/client/common/models/Address.json
@@ -37,6 +37,9 @@
     },
     "default": {
       "type": "boolean"
+    },
+    "defaultAgency": {
+      "type": "Number"
     }
   },
   "validations": [],
@@ -50,6 +53,11 @@
       "type": "hasOne",
       "model": "Client",
       "foreignKey": "id"
+    },
+    "defaultAgency": {
+      "type": "hasOne",
+      "model": "Agency",
+      "foreignKey": "id"
     }
   },
   "acls": [