Index: BL/EC/Common.mac.rou
===================================================================
diff -u -r762 -r1523
--- BL/EC/Common.mac.rou	(.../Common.mac.rou)	(revision 762)
+++ BL/EC/Common.mac.rou	(.../Common.mac.rou)	(revision 1523)
@@ -43,22 +43,19 @@
 	For EST=1:1:$ESTACK Set Body=Body_$C(13)_"   "_$STACK($STACK-EST,"PLACE")
 	Set Body=Body_$C(13)_$C(13)_"Device: "_$I_" Job: "_$J
 	Set Body=Body_$C(13)_"Server: "_$ZU(110)_" NameSpace: "_$ZU(5)
-	Set From="System@vanhoecke.be"
+	Set From=$$$SystemMail("VHISIE")
 	Set Subj="VHISIE - Error to Log"
-	Set To=$LB("pv@vanhoecke.be")
+	Set To=$lb(##class(TECH.Config.ConfigMgr).Instance().GetString("BL.EC.Common.MailErrorNaar"))
 	Do SendMiniMail^vhLib(From,To,Subj,Body,,,,,)
 	
 	Quit Logging
  
 WebServiceTrap()
 	;Fout gebruiksvriendelijk maken en mailen naar van hoecke indien niet op development server
-	If '$$InDevelop^vhLib() Do
-	. Do MailTrap()
-	. Set $ZERROR=##class(Res.Vertaling).GetVertalingPlus($$$VertalingsGroep,"InternalErrorVH","O",Taal,,1)
-	. Set Taal=$S($L($G(%Taal)):%Taal,$IsObject($G(%ECSession)):%ECSession.Taal,1:"E")
- 
-	s $ETRAP=""
- 
+	Do MailTrap()
+	;Set Taal=$S($L($G(%Taal)):%Taal,$IsObject($G(%ECSession)):%ECSession.Taal,1:"E")
+	;Set $ZERROR=##class(Res.Vertaling).GetVertalingPlus($$$VertalingsGroep,"InternalErrorVH","O",Taal,,1)
+	;s $ETRAP=""
 	Quit
 		
 MailTrap()
@@ -71,9 +68,9 @@
 	For EST=1:1:$ESTACK Set Body=Body_$C(13)_"   "_$STACK($STACK-EST,"PLACE")
 	Set Body=Body_$C(13)_$C(13)_"Device: "_$I_" Job: "_$J
 	Set Body=Body_$C(13)_"Server: "_$ZU(110)_" NameSpace: "_$ZU(5)
-	Set From="System@vanhoecke.be"
+	Set From=$$$SystemMail("VHISIE")
 	Set Subj="VHISIE - Errortrap "_$ZError
-	Set To=$LB("pv@vanhoecke.be")
+	Set To=$lb(##class(TECH.Config.ConfigMgr).Instance().GetString("BL.EC.Common.MailErrorNaar"))
 	/*   */       ; ORIG code - door PV
 	Do SendMiniMail^vhLib(From,To,Subj,Body,,,,,)
 	/*   * /