diff --git a/back/methods/docuware/deliveryNoteEmail.js b/back/methods/docuware/deliveryNoteEmail.js
index 1497dcdf9..1557a3a87 100644
--- a/back/methods/docuware/deliveryNoteEmail.js
+++ b/back/methods/docuware/deliveryNoteEmail.js
@@ -58,7 +58,10 @@ module.exports = Self => {
         for (const param in args)
             params[param] = args[param];
 
-        if (!recipient) params.recipient = models.Client.findById(recipientId, {fields: ['email']});
+        if (!recipient) {
+            client = await models.Client.findById(recipientId, {fields: ['email']});
+            params.recipient = client.email;
+        }
 
         const email = new Email('delivery-note', params);
 
diff --git a/modules/ticket/back/methods/ticket/closeAll.js b/modules/ticket/back/methods/ticket/closeAll.js
index 3726d85b7..6690126b9 100644
--- a/modules/ticket/back/methods/ticket/closeAll.js
+++ b/modules/ticket/back/methods/ticket/closeAll.js
@@ -52,7 +52,7 @@ module.exports = Self => {
                 JOIN province p ON p.id = c.provinceFk
                 JOIN country co ON co.id = p.countryFk
                 LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
-            WHERE al.code = 'PACKED' OR (am.code = 'refund' AND al.code != 'delivered')
+            WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code != 'delivered'))
                 AND DATE(t.shipped) BETWEEN DATE_ADD(?, INTERVAL -2 DAY)
                     AND util.dayEnd(?)
                 AND t.refFk IS NULL