diff --git a/modules/ticket/front/basic-data/step-one/index.html b/modules/ticket/front/basic-data/step-one/index.html
index 0e8d25b7c..98d92e7e2 100644
--- a/modules/ticket/front/basic-data/step-one/index.html
+++ b/modules/ticket/front/basic-data/step-one/index.html
@@ -7,8 +7,10 @@
 <form name="form">
     <vn-card class="vn-w-md vn-pa-lg">
         <vn-horizontal>
-            <vn-autocomplete vn-one
+            <vn-autocomplete 
+                vn-one
                 vn-id="client"
+                required="true"
                 url="Clients"
                 label="Client"
                 show-field="name"
@@ -18,7 +20,9 @@
                 initial-data="$ctrl.clientId"
                 order="id">
             </vn-autocomplete>
-            <vn-autocomplete vn-one
+            <vn-autocomplete 
+                vn-one
+                required="true"
                 data="$ctrl.addresses"
                 label="Address"
                 show-field="nickname"
@@ -41,6 +45,7 @@
                 </append>
             </vn-autocomplete>
             <vn-autocomplete vn-one
+                required="true"
                 url="Warehouses"
                 label="Warehouse"
                 show-field="name"
@@ -49,8 +54,9 @@
             </vn-autocomplete>
         </vn-horizontal>
         <vn-horizontal>
-            <vn-autocomplete
+            <vn-autocomplete 
                 vn-one
+                required="true"
                 url="Companies"
                 label="Company"
                 show-field="code"
@@ -59,8 +65,8 @@
                 initial-data="$ctrl.ticket.companyFk">
             </vn-autocomplete>
             <vn-autocomplete
-                vn-id="agencyMode"
                 vn-one
+                vn-id="agencyMode"
                 url="AgencyModes/byWarehouse"
                 label="Agency"
                 show-field="name"
@@ -70,6 +76,7 @@
             </vn-autocomplete>
             <vn-autocomplete
                 vn-one
+                required="true"
                 url="Zones/includingExpired"
                 label="Zone"
                 show-field="name"
@@ -85,16 +92,19 @@
         <vn-horizontal>
             <vn-date-picker
                 vn-one
+                required="true"
                 label="Shipped" 
                 ng-model="$ctrl.shipped">
             </vn-date-picker>
             <vn-input-time
                 vn-one
+                required="true"
                 label="Shipped hour" 
                 ng-model="$ctrl.shipped">
             </vn-input-time>
             <vn-date-picker
                 vn-one
+                required="true"
                 label="Landed" 
                 ng-model="$ctrl.landed">
             </vn-date-picker>
diff --git a/modules/ticket/front/basic-data/step-one/index.js b/modules/ticket/front/basic-data/step-one/index.js
index d7dbb8cd1..e7eb30583 100644
--- a/modules/ticket/front/basic-data/step-one/index.js
+++ b/modules/ticket/front/basic-data/step-one/index.js
@@ -99,6 +99,9 @@ class Controller extends Component {
 
             if (!value) return;
 
+            const agencyMode = this.$.agencyMode.selection;
+            this.ticket.warehouseFk = agencyMode.warehouseFk;
+
             this.getLanded({
                 shipped: this.ticket.shipped,
                 addressFk: this.ticket.addressFk,
diff --git a/modules/zone/back/methods/agency-mode/byWarehouse.js b/modules/zone/back/methods/agency-mode/byWarehouse.js
index c89217eef..f336f5ed2 100644
--- a/modules/zone/back/methods/agency-mode/byWarehouse.js
+++ b/modules/zone/back/methods/agency-mode/byWarehouse.js
@@ -25,7 +25,7 @@ module.exports = Self => {
         filter = mergeFilters(filter, {where});
 
         let stmt = new ParameterizedSQL(
-            `SELECT id, name
+            `SELECT id, name, warehouseFk
                 FROM (
                     SELECT DISTINCT am.id, am.name, am.isActive, zw.warehouseFk
                         FROM zoneWarehouse zw