diff --git a/modules/client/back/methods/client/incotermsAuthorizationEmail.js b/modules/client/back/methods/client/incotermsAuthorizationEmail.js
index 4a21f20b0..9b3686b07 100644
--- a/modules/client/back/methods/client/incotermsAuthorizationEmail.js
+++ b/modules/client/back/methods/client/incotermsAuthorizationEmail.js
@@ -33,6 +33,12 @@ module.exports = Self => {
                 type: 'number',
                 description: 'The company id',
                 required: true
+            },
+            {
+                arg: 'addressId',
+                type: 'number',
+                description: 'The address id',
+                required: true
             }
         ],
         returns: {
diff --git a/modules/client/back/methods/client/incotermsAuthorizationHtml.js b/modules/client/back/methods/client/incotermsAuthorizationHtml.js
index 0a6bba0a8..af585b1ae 100644
--- a/modules/client/back/methods/client/incotermsAuthorizationHtml.js
+++ b/modules/client/back/methods/client/incotermsAuthorizationHtml.js
@@ -21,6 +21,12 @@ module.exports = Self => {
                 type: 'number',
                 description: 'The company id',
                 required: true
+            },
+            {
+                arg: 'addressId',
+                type: 'number',
+                description: 'The address id',
+                required: true
             }
         ],
         returns: [
diff --git a/modules/client/back/methods/client/incotermsAuthorizationPdf.js b/modules/client/back/methods/client/incotermsAuthorizationPdf.js
index d37e473f1..ffe17c72f 100644
--- a/modules/client/back/methods/client/incotermsAuthorizationPdf.js
+++ b/modules/client/back/methods/client/incotermsAuthorizationPdf.js
@@ -21,6 +21,12 @@ module.exports = Self => {
                 type: 'number',
                 description: 'The company id',
                 required: true
+            },
+            {
+                arg: 'addressId',
+                type: 'number',
+                description: 'The address id',
+                required: true
             }
         ],
         returns: [
diff --git a/modules/client/front/sample/create/index.html b/modules/client/front/sample/create/index.html
index f9db03036..9dce7ec72 100644
--- a/modules/client/front/sample/create/index.html
+++ b/modules/client/front/sample/create/index.html
@@ -71,6 +71,7 @@
                 required="true">
             </vn-autocomplete>
             <vn-autocomplete
+                ng-if="sampleType.selection.id == 20"
                 vn-one
                 required="true"
                 data="$ctrl.addresses"
diff --git a/print/templates/email/incoterms-authorization/incoterms-authorization.js b/print/templates/email/incoterms-authorization/incoterms-authorization.js
index cb3cebc09..9e98f60a9 100755
--- a/print/templates/email/incoterms-authorization/incoterms-authorization.js
+++ b/print/templates/email/incoterms-authorization/incoterms-authorization.js
@@ -28,6 +28,10 @@ module.exports = {
         companyId: {
             type: Number,
             required: true
+        },
+        addressId: {
+            type: Number,
+            required: true
         }
     }
 };
diff --git a/print/templates/reports/incoterms-authorization/incoterms-authorization.html b/print/templates/reports/incoterms-authorization/incoterms-authorization.html
index e4e4635f3..8c0a327ab 100644
--- a/print/templates/reports/incoterms-authorization/incoterms-authorization.html
+++ b/print/templates/reports/incoterms-authorization/incoterms-authorization.html
@@ -3,16 +3,16 @@
         <div class="grid-block">
             <p
                 v-html="$t('description', {
-                socialName: client.socialName,
+                socialName: address.nickname,
                 name: client.name,
-                addressId: address.street,
+                address: address.street,
                 country: client.country,
                 fiscalID: client.fi
             })"
             ></p>
             <p
                 v-html="$t('declaration', {
-                socialName: client.socialName
+                socialName: address.nickname
             })"
             ></p>
             <p
@@ -20,7 +20,7 @@
                 v-html="$t('declarations[' + $index + ']', {
                     companyName: company.name,
                     companyCity: company.city,
-                    socialName: client.socialName,
+                    socialName: address.nickname,
                     destinationCountry: client.country
                 })"
             ></p>
diff --git a/print/templates/reports/incoterms-authorization/incoterms-authorization.js b/print/templates/reports/incoterms-authorization/incoterms-authorization.js
index e50cd99ec..22ae13167 100755
--- a/print/templates/reports/incoterms-authorization/incoterms-authorization.js
+++ b/print/templates/reports/incoterms-authorization/incoterms-authorization.js
@@ -20,7 +20,8 @@ module.exports = {
             required: true
         },
         addressId: {
-            type: Number
+            type: Number,
+            required: true
         }
     }
 };