diff --git a/db/changes/10491-august/00-defaultPayDem_sameAs_production.sql b/db/changes/10491-august/00-defaultPayDem_sameAs_production.sql
new file mode 100644
index 0000000000..2a7f5c61f7
--- /dev/null
+++ b/db/changes/10491-august/00-defaultPayDem_sameAs_production.sql
@@ -0,0 +1,2 @@
+INSERT INTO vn.payDem (id,payDem)
+	VALUES (7,'0');
diff --git a/db/changes/10491-august/00-defaultSupplierActivityFk_to_Null.sql b/db/changes/10491-august/00-defaultSupplierActivityFk_to_Null.sql
new file mode 100644
index 0000000000..1fc4e29058
--- /dev/null
+++ b/db/changes/10491-august/00-defaultSupplierActivityFk_to_Null.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.supplier MODIFY COLUMN supplierActivityFk varchar(45) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL NULL;
diff --git a/db/changes/10491-august/00-newSupplier_Modify_supplier.sql b/db/changes/10491-august/00-newSupplier_Modify_supplier.sql
deleted file mode 100644
index 29a1884809..0000000000
--- a/db/changes/10491-august/00-newSupplier_Modify_supplier.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-ALTER TABLE `vn`.`supplier` MODIFY COLUMN payMethodFk tinyint(3) unsigned DEFAULT NULL NULL;
-
-/* ------------------------------------------------------------------------------------------- */
-
-ALTER TABLE `vn`.`supplier` MODIFY COLUMN supplierActivityFk varchar(45) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL NULL;
-
-/* ------------------------------------------------------------------------------------------- */
-
-ALTER TABLE `vn`.`supplierLog` MODIFY COLUMN userFk int(10) unsigned NULL;
diff --git a/db/changes/10491-august/00-payMethodFk_Allow_Null.sql b/db/changes/10491-august/00-payMethodFk_Allow_Null.sql
new file mode 100644
index 0000000000..6fd2fee6ed
--- /dev/null
+++ b/db/changes/10491-august/00-payMethodFk_Allow_Null.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.supplier MODIFY COLUMN payMethodFk tinyint(3) unsigned NULL;
diff --git a/db/changes/10491-august/00-supplierActivityFk_Allow_Null.sql b/db/changes/10491-august/00-supplierActivityFk_Allow_Null.sql
new file mode 100644
index 0000000000..6f4cdcc398
--- /dev/null
+++ b/db/changes/10491-august/00-supplierActivityFk_Allow_Null.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.supplier MODIFY COLUMN supplierActivityFk varchar(45) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT 'flowersPlants' NULL;
diff --git a/modules/supplier/back/methods/supplier/filter.js b/modules/supplier/back/methods/supplier/filter.js
index 3500afacd1..0b473f7df8 100644
--- a/modules/supplier/back/methods/supplier/filter.js
+++ b/modules/supplier/back/methods/supplier/filter.js
@@ -95,8 +95,8 @@ module.exports = Self => {
                     pm.name AS payMethod,
                     pd.payDem AS payDem
                 FROM vn.supplier s
-                    JOIN vn.payMethod pm ON pm.id = s.payMethodFk
-                    JOIN vn.payDem pd ON pd.id = s.payDemFk`
+                    LEFT JOIN vn.payMethod pm ON pm.id = s.payMethodFk
+                    LEFT JOIN vn.payDem pd ON pd.id = s.payDemFk`
         );
 
         stmt.merge(conn.makeSuffix(filter));
diff --git a/modules/supplier/back/methods/supplier/newSupplier.js b/modules/supplier/back/methods/supplier/newSupplier.js
index 748d7f5ee6..0395e982bf 100644
--- a/modules/supplier/back/methods/supplier/newSupplier.js
+++ b/modules/supplier/back/methods/supplier/newSupplier.js
@@ -24,7 +24,6 @@ module.exports = Self => {
         if (typeof(params) == 'string')
             params = JSON.parse(params);
 
-        params.payDemFk = 1;
         params.nickname = params.name;
 
         if (!myOptions.transaction) {
@@ -42,7 +41,6 @@ module.exports = Self => {
             };
         } catch (e) {
             if (tx) await tx.rollback();
-            return params;
         }
     };
 };
diff --git a/modules/supplier/back/methods/supplier/specs/newSupplier.spec.js b/modules/supplier/back/methods/supplier/specs/newSupplier.spec.js
index aacb2d42dd..b252c4d60e 100644
--- a/modules/supplier/back/methods/supplier/specs/newSupplier.spec.js
+++ b/modules/supplier/back/methods/supplier/specs/newSupplier.spec.js
@@ -11,7 +11,6 @@ describe('Supplier newSupplier()', () => {
         result = result.supplier;
 
         expect(result.name).toEqual('TestSupplier-1');
-        expect(result.payDemFk).toEqual(1);
         expect(result.id).toEqual(443);
 
         const createdSupplier = await app.models.Supplier.findById(result.id);
@@ -34,7 +33,7 @@ describe('Supplier newSupplier()', () => {
         expect(createdSupplier.provinceFk).toBeNull();
         expect(createdSupplier.postCode).toBeNull();
         expect(createdSupplier.payMethodFk).toBeNull();
-        expect(createdSupplier.payDemFk).toEqual(1);
+        expect(createdSupplier.payDemFk).toEqual(7);
         expect(createdSupplier.payDay).toBeNull();
         expect(createdSupplier.nickname).toEqual(result.name);
         expect(createdSupplier.workerFk).toBeNull();