Index: TECH/Context/RuntimeContext.cls.xml
===================================================================
diff -u -r3818 -r3916
--- TECH/Context/RuntimeContext.cls.xml	(.../RuntimeContext.cls.xml)	(revision 3818)
+++ TECH/Context/RuntimeContext.cls.xml	(.../RuntimeContext.cls.xml)	(revision 3916)
@@ -164,34 +164,25 @@
 <FormalSpec>CHUIActief:%Boolean=$$$True</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	If (..ComputerNaam = "")
-	{
+	If (..ComputerNaam = ""){
 		Set IP = ""
 		Set ComputerNaam = ""
 		
-		If ($IsObject($Get(%request)))
-		{	
+		If ($IsObject($Get(%request))){	
 			Set IP = %request.GetCgiEnv("REMOTE_ADDR")
-		}
-		Else
-		{
+		} Else {
 			Set IONaam = $I
-			If ($E(IONaam,1,5) = "|TNT|")
-			{
+			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
 				} Else {
 					Set ..ComputerNaam = DeviceID
-					if $ListFind(##class(TECH.Config.ConfigMgr).Instance().GetString("TerminalServers",""),$$$UCase($Piece(..ComputerNaam,".",1))) {
-						#dim RemoteDesktopClient as %String = ..ShellExecuteDirectAndRead("GETRDPCLIENTNAME","","",CHUIActief)
+					if ( ..ComputerNaam [ ##class(TECH.Config.ConfigMgr).Instance().GetString("VDIServerPrefix","VDI-APPS")) {
+						#dim RemoteDesktopClient as %String = ##class(APPS.CHUI.NativeCommandoService).%New().ReflectionRDPClientName()
 						If $$$HasLength(RemoteDesktopClient){
-							if ($ListFind(##class(TECH.Config.ConfigMgr).Instance().GetString("ThinClients",""),$$$UCase($Piece(RemoteDesktopClient,".",1)),RemoteDesktopClient)) {
-								Set ..ComputerNaam = RemoteDesktopClient
-							} else {
-								; geen omzetting.
-							}
+							Set ..ComputerNaam = RemoteDesktopClient ; alleen voor bv toerlijst
 						} else {
 							Do ##class(vhLib.Logger).%New().ErrorMail("Reflection terminal emulatie", "Reflection vanuit RDP session op "_ ..ComputerNaam _" : Gebruik een terminalserver compatible Reflection configuratie bestand")
 						}
@@ -200,8 +191,7 @@
 			}
 		}
 		// Als we enkel het IP kennen dan gaan we proberen de pc-naam op te zoeken
-		If (IP '= "")
-		{
+		If (IP '= ""){
 			Set FileName="PING"_$J_$$UPTRIMAN^vhRtn1(IP)
 			Set Exec="NSLOOKUP "_IP_" > c:\"_FileName  // ping vervangen door nslookup 
 			Set Ok=$ZF(-1,"NSLOOKUP "_IP_" > c:\"_FileName)
@@ -215,8 +205,7 @@
 			Set ComputerNaamOutput = Stream.ReadLine()
 			
 			Set PiecesIterator = ##class(TECH.PiecesIterator).%New(ComputerNaamOutput," ")
-			While (PiecesIterator.HasNext())
-			{
+			While (PiecesIterator.HasNext()){
 				Set ..ComputerNaam = PiecesIterator.Next()
 			}
 			
Index: vhLib/TerminalDevice.cls.xml
===================================================================
diff -u -r3893 -r3916
--- vhLib/TerminalDevice.cls.xml	(.../TerminalDevice.cls.xml)	(revision 3893)
+++ vhLib/TerminalDevice.cls.xml	(.../TerminalDevice.cls.xml)	(revision 3916)
@@ -12,7 +12,7 @@
 
 <Method name="GeefIctGebruikerInitialenVanIP">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>IP4Adres:%String,ValideerInitialen:%Boolean=1</FormalSpec>
+<FormalSpec>IP4Adres:%String,ValideerInitialen:%Boolean=1,ClientName:%String=""</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim IP4Delen3en4 As %String = $piece(IP4Adres,".",3,4)
@@ -41,6 +41,10 @@
 		"1.43":"mcl",
 		"1.252":"jlm",
 		:"")
+		
+   If (GebruikerInitialen = "")  {
+	   Set GebruikerInitialen = ..GeefIctGebruikerInitialenVanToestel("|TNT|"_ClientName)
+   }
 	
    If (ValideerInitialen) && (GebruikerInitialen = "")  {
 		Do ##class(TECH.Exceptions.InvalidInputException).Throw("GeefIctGebruikerInitialenVanIP is niet mogelijk. Definieer initialen voor IP '"_IP4Adres_"'.")
@@ -57,6 +61,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim result As %String = $$$TextBetween(Toestel,"|TNT|","_")
+	Do ##class(Tools.Wlip).%New(207).String("init from clientname?" _ ##class(TECH.Context.RuntimeContext).Instance().GeefComputerNaam())
 	Set result = $Select(result["-":$Piece(result,"-",1),1:result)
 	If (result = "WS001") {
 		Set result = "ash"