Index: vhLib/Logger.cls.xml
===================================================================
diff -u -r744 -r903
--- vhLib/Logger.cls.xml	(.../Logger.cls.xml)	(revision 744)
+++ vhLib/Logger.cls.xml	(.../Logger.cls.xml)	(revision 903)
@@ -136,8 +136,10 @@
 
 <Method name="GetMailAddress">
 <Implementation><![CDATA[
-	#dim User As %String = ##class(vhLib.TerminalDevice).GeefIctGebruikerInitialenVanIP($$GetClientIP^vhLib)
-	Quit:($Length(User)) User_"@vanhoecke.be"
+	if '##class(TECH.Config.ConfigMgr).Instance().GetBoolean("ForceMailForwardingToDefaultMailAddress") { 
+		#dim User As %String = ##class(vhLib.TerminalDevice).GeefIctGebruikerInitialenVanIP($$GetClientIP^vhLib)
+		Quit:($Length(User)) User_"@vanhoecke.be"
+	}
 	#dim MailTo As %String = ##class(TECH.Config.ConfigMgr).Instance().GetString("TECH.Error.impl.ErrorHandler_DefaultMailAddress")
 	Quit MailTo
 ]]></Implementation>