Index: TECH/Context/RuntimeContext.cls.xml
===================================================================
diff -u -r28 -r37
--- TECH/Context/RuntimeContext.cls.xml	(.../RuntimeContext.cls.xml)	(revision 28)
+++ TECH/Context/RuntimeContext.cls.xml	(.../RuntimeContext.cls.xml)	(revision 37)
@@ -28,7 +28,7 @@
 <ClassMethod>1</ClassMethod>
 <ReturnType>TECH.Context.RuntimeContext</ReturnType>
 <Implementation><![CDATA[
-    If '$data(%TECHContextRuntimeContext) Set %TECHContextRuntimeContext = ..%New()
+    If ('$data(%TECHContextRuntimeContext) || ('$IsObject(%TECHContextRuntimeContext))) Set %TECHContextRuntimeContext = ..%New()
     Quit %TECHContextRuntimeContext
 ]]></Implementation>
 </Method>
@@ -42,11 +42,17 @@
 <Method name="GeefGebruikerInitialen">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Set GebruikerInitialen = $$USERNAME^vhUSER(,-1)
-	If (GebruikerInitialen = "")
-	{
-		Set GebruikerInitialen = "SYS"
+	If $$$Not(##class(TECH.Config.ConfigMgr).Instance().GetOmgeving()["DMZ"){
+		Set GebruikerInitialen = $$USERNAME^vhUSER(,-1)
+		If (GebruikerInitialen = "") {	
+			Set GebruikerInitialen = "SYS"
+		}
 	}
+	else {
+		Set GebruikerInitialen = "SYS_"_##class(TECH.Config.ConfigMgr).Instance().GetOmgeving()	
+	}
+		
+	
 	Quit GebruikerInitialen
 ]]></Implementation>
 </Method>
@@ -71,6 +77,7 @@
 			If ($E(IONaam,1,5) = "|TNT|")
 			{
 				Set DeviceID = $P($E(IONaam,6,99),":",1)
+				if $zcvt(DeviceID,"U")="LOCALHOST" set DeviceID=$$$Server
 				If (DeviceID?3(1.3N1".")1.3N) // Controle op IP-formaat
 				{
 					Set IP = DeviceID