diff --git a/_UTIL/TestOracle/_CREA_WORK.bat b/_UTIL/TestOracle/_CREA_WORK.bat
index 8004f8d7..508507b9 100644
--- a/_UTIL/TestOracle/_CREA_WORK.bat
+++ b/_UTIL/TestOracle/_CREA_WORK.bat
@@ -22,7 +22,7 @@ ECHO @%BUILD%\DB%DBVER%\FCLT%DBVER%.sql >xtmp.sql
 ECHO UPDATE fac_version SET fac_version_cust = 'CREA'; >>xtmp.sql
 ECHO @@z:\Project\FACILITOR\Database\trunk\_UTIL\SUPPORT_IDP\supportJWT_SAAS.sql>>xtmp.sql
 ECHO EXIT >>xtmp.sql
-sqlplus.exe %targetUSER%/%targetPASS%@%targetSERVER% @xtmp.sql | FINDSTR /C:"BEGIN adm.sys" /C:"ORA-" C:"PLS-" /C:"SP2-" /C:"Waarschuwing: package-body is aangemaakt met compilatiefouten."
+sqlplus.exe %targetUSER%/%targetPASS%@%targetSERVER% @xtmp.sql | FINDSTR /C:"BEGIN adm.sys" /C:"ORA-" /C:"PLS-" /C:"SP2-" /C:"Waarschuwing: package-body is aangemaakt met compilatiefouten."
 DEL xtmp.sql
 goto end
 
diff --git a/_UTIL/TestOracle/emailerror.js b/_UTIL/TestOracle/emailerror.js
index 9e52fba0..2b29e8c8 100644
--- a/_UTIL/TestOracle/emailerror.js
+++ b/_UTIL/TestOracle/emailerror.js
@@ -1,12 +1,16 @@
 var wshShell = WScript.CreateObject( "WScript.Shell" );
 
 var dbver = WScript.Arguments(0).toUpperCase();
+var mailall = WScript.Arguments.Length > 1 && WScript.Arguments(1) == "mailall";
 
 fac_send_mail_html("j.grootlipman@facilitor.nl");
-fac_send_mail_html("e.groener@facilitor.nl");
-fac_send_mail_html("m.geerdink@facilitor.nl");
-fac_send_mail_html("a.tiehuis@facilitor.nl");
-fac_send_mail_html("gijs.wassink@aareon.nl");
+if (mailall)
+{
+    fac_send_mail_html("e.groener@facilitor.nl");
+    fac_send_mail_html("m.geerdink@facilitor.nl");
+    fac_send_mail_html("a.tiehuis@facilitor.nl");
+    fac_send_mail_html("gijs.wassink@aareon.nl");
+}
 //fac_send_mail_html("glipman@home.nl");
 //fac_send_mail_html("helpdesk@facilitor.nl");
 
@@ -15,7 +19,7 @@ function fac_send_mail_html(adrTo,strSubj,strBody)
 {
     strSubj = "ORA-errors in TestOracle " + new Date();
     strBody = "ORA-errors in TestOracle" ;
-    strBody += "<br/>More details in z:\\Project\\FACILITOR\\BUILD\\DB" + dbver + "\\OUTPUT"
+    strBody += "<br/>More details in z:\\Project\\FACILITOR\\BUILD\\DB" + dbver + "\\TEST_OUTPUT"
     strBody += "\n<br/><code>";
     while (!WScript.StdIn.AtEndOfStream)
     {
diff --git a/_UTIL/TestOracle/testwork40.bat b/_UTIL/TestOracle/testwork40.bat
index 3c380688..aeaf2750 100644
--- a/_UTIL/TestOracle/testwork40.bat
+++ b/_UTIL/TestOracle/testwork40.bat
@@ -1,4 +1,4 @@
 SET DBVER=40
 SET DBPRV=39
 SET DBPRVPATH=z:\Archief\FACILITOR\2020.2\DB39a\FCLT39a.sql
-@testworkCOMMON.bat trunk
\ No newline at end of file
+@testworkCOMMON.bat trunk %*
\ No newline at end of file
diff --git a/_UTIL/TestOracle/testworkCOMMON.bat b/_UTIL/TestOracle/testworkCOMMON.bat
index 5d4f4169..254628a0 100644
--- a/_UTIL/TestOracle/testworkCOMMON.bat
+++ b/_UTIL/TestOracle/testworkCOMMON.bat
@@ -13,9 +13,10 @@ GOTO EINDE
 
 :START
 @echo off
-REM Usage: %0
+REM Usage: %0 [mailall]
+SET mailall=%1
 
-SET OUTPUT=%BUILD%\DB%DBVER%\OUTPUT
+SET OUTPUT=%BUILD%\DB%DBVER%\TEST_OUTPUT
 MKDIR %OUTPUT%>nul
 MKDIR %OUTPUT%\OLD>nul
 move %OUTPUT%\*.lst %OUTPUT%\OLD
@@ -52,7 +53,7 @@ cscript compare.js %DBPRV% %DBVER% >>diffwork_%DBVER%.lst 2>>&1
 findstr /i "ORA-" "diffwork_%DBVER%.lst"
 if %errorlevel%==1 GOTO EINDE
 
-findstr /C:"ORA-" /C:"PLS-" "diffwork_%DBVER%.lst" | cscript emailerror.js %DBVER% >> %0.log 2>>&1
+findstr /C:"ORA-" /C:"PLS-" "diffwork_%DBVER%.lst" | cscript emailerror.js %DBVER% %mailall% >> %0.log 2>>&1
 @TITLE ORA-Errors found, e-mail sent
 ::PAUSE