diff --git a/client/ticket/src/data/step-one/index.html b/client/ticket/src/data/step-one/index.html
index 19bf410c6..3db14f580 100644
--- a/client/ticket/src/data/step-one/index.html
+++ b/client/ticket/src/data/step-one/index.html
@@ -8,8 +8,8 @@
                 label="Client"
                 show-field="name"
                 value-field="id"
-                field="$ctrl.ticket.clientFk"
-                initial-data="$ctrl.ticket.clientFk" 
+                field="$ctrl.clientFk"
+                initial-data="$ctrl.clientFk" 
                 on-change="$ctrl.onChange()">
             </vn-autocomplete>
             <vn-autocomplete vn-one
diff --git a/client/ticket/src/data/step-one/index.js b/client/ticket/src/data/step-one/index.js
index 5a9d8ab5b..d7d81747b 100644
--- a/client/ticket/src/data/step-one/index.js
+++ b/client/ticket/src/data/step-one/index.js
@@ -9,17 +9,22 @@ class Controller {
         this.vnApp = vnApp;
     }
 
+    set clientFk(value) {
+        this.ticket.clientFk = value;
+        this.ticket.addressFk = null;
+    }
+
+    get clientFk() {
+        if (this.ticket)
+            return this.ticket.clientFk;
+    }
+
     $onInit() {
         this.data.registerChild(this);
     }
 
-    onChange() {
-        if (this.ticket)
-            this.ticket.addressFk = null;
-    }
-
     getAddresses() {
-        if (this.ticket)
+        if (this.ticket && this.ticket.addressFk)
             return `/api/Clients/${this.ticket.clientFk}/addresses`;
     }