diff --git a/db/changes/10161-postValentineDay/00-sample.sql b/db/changes/10161-postValentineDay/00-sample.sql
new file mode 100644
index 000000000..d34835888
--- /dev/null
+++ b/db/changes/10161-postValentineDay/00-sample.sql
@@ -0,0 +1,6 @@
+ALTER TABLE `vn`.`sample` 
+ADD COLUMN `hasPreview` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1' AFTER `hasCompany`,
+CHANGE COLUMN `isVisible` `isVisible` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1' ,
+CHANGE COLUMN `hasCompany` `hasCompany` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0' ;
+
+UPDATE `vn`.`sample` SET `hasPreview` = '0' WHERE (`id` = '14');
diff --git a/modules/client/back/models/sample.json b/modules/client/back/models/sample.json
index 8993250f3..725bfb9c7 100644
--- a/modules/client/back/models/sample.json
+++ b/modules/client/back/models/sample.json
@@ -22,7 +22,10 @@
             "type": "Boolean"
         },
         "hasCompany": {
-            "type": "Number"
+            "type": "Boolean"
+        },
+        "hasPreview": {
+            "type": "Boolean"
         }
     },
     "scopes": {
diff --git a/modules/client/front/sample/create/index.html b/modules/client/front/sample/create/index.html
index cd3412868..22f95eb20 100644
--- a/modules/client/front/sample/create/index.html
+++ b/modules/client/front/sample/create/index.html
@@ -23,7 +23,7 @@
             <vn-autocomplete vn-one vn-id="sampleType"
                 ng-model="$ctrl.clientSample.typeFk"
                 model="ClientSample.typeFk"
-                fields="['code','hasCompany']"
+                fields="['code','hasCompany', 'hasPreview']"
                 url="Samples/visible"
                 show-field="description"
                 value-field="id"
@@ -31,7 +31,7 @@
             </vn-autocomplete>
             <vn-autocomplete vn-one
                 ng-model="$ctrl.companyId"
-                model="ClientSample.companyId"
+                model="ClientSample.companyFk"
                 data="companiesData"
                 show-field="code"
                 value-field="id"
@@ -42,7 +42,10 @@
     </vn-card>
     <vn-button-bar>
         <vn-submit label="Send"></vn-submit>
-        <vn-button label="Preview" ng-click="$ctrl.showPreview()"></vn-button>
+        <vn-button ng-if="sampleType.selection.hasPreview"
+            label="Preview" 
+            ng-click="$ctrl.showPreview()">
+        </vn-button>
         <vn-button ui-sref="client.card.sample.index" label="Cancel"></vn-button>
     </vn-button-bar>
 </form>
diff --git a/modules/client/front/sample/create/index.js b/modules/client/front/sample/create/index.js
index e3504785d..f478243c7 100644
--- a/modules/client/front/sample/create/index.js
+++ b/modules/client/front/sample/create/index.js
@@ -26,13 +26,13 @@ class Controller extends Component {
     }
 
     get companyId() {
-        if (!this.clientSample.companyId)
-            this.clientSample.companyId = this.vnConfig.companyFk;
-        return this.clientSample.companyId;
+        if (!this.clientSample.companyFk)
+            this.clientSample.companyFk = this.vnConfig.companyFk;
+        return this.clientSample.companyFk;
     }
 
     set companyId(value) {
-        this.clientSample.companyId = value;
+        this.clientSample.companyFk = value;
     }
 
     onSubmit() {
@@ -74,11 +74,11 @@ class Controller extends Component {
         if (!sampleType)
             return this.vnApp.showError(this.$translate.instant('Choose a sample'));
 
-        if (sampleType.hasCompany && !this.clientSample.companyId)
+        if (sampleType.hasCompany && !this.clientSample.companyFk)
             return this.vnApp.showError(this.$translate.instant('Choose a company'));
 
         if (sampleType.hasCompany)
-            params.companyId = this.clientSample.companyId;
+            params.companyId = this.clientSample.companyFk;
 
         if (isPreview) params.isPreview = true;
 
diff --git a/modules/client/front/sample/create/index.spec.js b/modules/client/front/sample/create/index.spec.js
index da9a557f1..d3817a439 100644
--- a/modules/client/front/sample/create/index.spec.js
+++ b/modules/client/front/sample/create/index.spec.js
@@ -107,7 +107,7 @@ describe('Client', () => {
                 expect(controller.$http.get).not.toHaveBeenCalled();
             });
 
-            it(`should perform an HTTP query without passing companyId param`, () => {
+            it(`should perform an HTTP query without passing companyFk param`, () => {
                 controller.$.sampleType.selection = {
                     hasCompany: false,
                     code: 'MyReport'
@@ -116,25 +116,34 @@ describe('Client', () => {
                     clientId: 101,
                     recipient: 'client@email.com'
                 };
+                const expectedParams = {
+                    clientId: 101,
+                    recipient: 'client@email.com'
+                };
+                const serializedParams = $httpParamSerializer(expectedParams);
 
-                const serializedParams = $httpParamSerializer(controller.clientSample);
                 $httpBackend.expect('GET', `email/MyReport?${serializedParams}`).respond(true);
                 controller.send(false, () => {});
                 $httpBackend.flush();
             });
 
-            it(`should perform an HTTP query passing companyId param`, () => {
+            it(`should perform an HTTP query passing companyFk param`, () => {
                 controller.$.sampleType.selection = {
                     hasCompany: true,
                     code: 'MyReport'
                 };
                 controller.clientSample = {
+                    clientId: 101,
+                    recipient: 'client@email.com',
+                    companyFk: 442
+                };
+                const expectedParams = {
                     clientId: 101,
                     recipient: 'client@email.com',
                     companyId: 442
                 };
+                const serializedParams = $httpParamSerializer(expectedParams);
 
-                const serializedParams = $httpParamSerializer(controller.clientSample);
                 $httpBackend.expect('GET', `email/MyReport?${serializedParams}`).respond(true);
                 controller.send(false, () => {});
                 $httpBackend.flush();