Index: vhLib/Macro.inc.rou
===================================================================
diff -u -r241 -r419
--- vhLib/Macro.inc.rou	(.../Macro.inc.rou)	(revision 241)
+++ vhLib/Macro.inc.rou	(.../Macro.inc.rou)	(revision 419)
@@ -7,10 +7,10 @@
 #define clRed 	$ZH("000000")
 
 
-#define IctUserFromIP(%ip)             $Case($P(%ip,".",3,4), "1.15":"pv", "1.27":"cw", "1.97":"wv", "1.127":"jbl", "1.138":"wro", "1.150":"pra", "1.191":"csc" , "1.195":"jcl", "1.204":"fma" , "1.205":"wv", "1.206":"jcl", "1.49":"csc", "1.95":"jbl","1.42":"mvi","1.51":"mvi",:"")
+#define IctUserFromIP(%ip)             $Case($P(%ip,".",3,4), "1.15":"pv", "1.27":"cw", "1.97":"wv", "1.127":"jbl", "1.138":"wro", "1.150":"pra", "1.191":"csc" , "1.195":"jcl", "1.204":"fma" , "1.205":"wv", "1.206":"jcl", "1.49":"csc", "1.95":"jbl","1.42":"mvi","1.51":"mvi","1.26":"mma",:"")
 
 #define UserFromDevice(%v)             $$$TextBetween(%v,"|TNT|","_")
-#define IctUserFromDevice(%v)          $Select($$$UserFromDevice(%v)?1(1"pv",1"cw",1"wv",1"jbl",1"wro",1"pra",1"jcl",1"fma",1"csc",1"mvi"):$$$UserFromDevice(%v), 1:"")
+#define IctUserFromDevice(%v)          $Select($$$UserFromDevice(%v)?1(1"pv",1"cw",1"wv",1"jbl",1"wro",1"pra",1"jcl",1"fma",1"csc",1"mvi",1"mma"):$$$UserFromDevice(%v), 1:"")
  
 #define IctSysOp					   "ICT_SysOp@vanhoecke.be"
 #define IctMeldingen				   "ICT_Meldingen@vanhoecke.be"
Index: vhLib/Device.cls.xml
===================================================================
diff -u
--- vhLib/Device.cls.xml	(revision 0)
+++ vhLib/Device.cls.xml	(revision 419)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhLib.Device">
+<IncludeCode>vhLib.Macro</IncludeCode>
+<Super>%RegisteredObject</Super>
+
+<Method name="GeefIctGebruikerInitialenVanIP">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>IP4Adres:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim IP4Delen3en4 As %String = $piece(IP4Adres,".",3,4)
+	quit $Case(IP4Delen3en4, 
+		"1.15":"pv", 
+		"1.27":"cw", 
+		"1.97":"wv", 
+		"1.205":"wv", 
+		"1.127":"jbl", 
+		"1.138":"wro", 
+		"1.150":"pra", 
+		"1.191":"csc" , 
+		"1.195":"jcl", 
+		"1.206":"jcl", 
+		"1.204":"fma" , 
+		"1.49":"csc", 
+		"1.95":"jbl",
+		"1.42":"mvi",
+		"1.51":"mvi",
+		"1.26":"mma",
+		:"")
+]]></Implementation>
+</Method>
+
+<Method name="GeefGebruikerInitialenVanToestel">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Toestel:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim result As %String = $$$TextBetween(Toestel,"|TNT|","_")
+	set result = $piece(result,"-",1)
+	quit result
+]]></Implementation>
+</Method>
+
+<Method name="GeefIctGebruikerInitialenVanToestel">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Toestel:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim GebruikerInitialenVanToestel As %String = $$$LCase(..GeefGebruikerInitialenVanToestel(Toestel))
+	 
+	quit $select(GebruikerInitialenVanToestel?1(1"pv",1"cw",1"wv",1"jbl",1"wro",1"pra",1"jcl",1"fma",1"csc",1"mvi",1"mma"):GebruikerInitialenVanToestel, 1:"")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhLib/Logger.cls.xml
===================================================================
diff -u -r370 -r419
--- vhLib/Logger.cls.xml	(.../Logger.cls.xml)	(revision 370)
+++ vhLib/Logger.cls.xml	(.../Logger.cls.xml)	(revision 419)
@@ -106,7 +106,7 @@
 
 <Method name="GetMailAddress">
 <Implementation><![CDATA[
-	#dim User As %String =$$$IctUserFromIP($$GetClientIP^vhLib)
+	#dim User As %String = ##class(vhLib.Device).GeefGebruikerInitialenVanIP($$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