Index: TECH/Context/RuntimeContext.cls.xml
===================================================================
diff -u -r966 -r1806
--- TECH/Context/RuntimeContext.cls.xml	(.../RuntimeContext.cls.xml)	(revision 966)
+++ TECH/Context/RuntimeContext.cls.xml	(.../RuntimeContext.cls.xml)	(revision 1806)
@@ -53,6 +53,17 @@
 <Private>1</Private>
 </Property>
 
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<PublicList>QU</PublicList>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Do ..ZetGebruikerID(..BuildGebruikerID($get(QU(1),0)))
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="Instance">
 <ClassMethod>1</ClassMethod>
 <ReturnType>TECH.Context.RuntimeContext</ReturnType>
@@ -72,6 +83,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="BuildGebruikerID">
+<FormalSpec>vhUserId:%String="0"</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit "4682||"_vhUserId
+]]></Implementation>
+</Method>
+
 <Method name="ZetGebruikerID">
 <FormalSpec>GebruikerID:%String</FormalSpec>
 <Implementation><![CDATA[
@@ -82,7 +101,7 @@
 
 <Method name="GeefGebruikerID">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..GebruikerID
+<Implementation><![CDATA[	Quit $get(^||RuntimeContext("GebruikerID"),..BuildGebruikerID())
 ]]></Implementation>
 </Method>
 
@@ -249,17 +268,6 @@
 <Implementation><![CDATA[	quit ..Applicatie
 ]]></Implementation>
 </Method>
-
-<Method name="%OnNew">
-<Private>1</Private>
-<ProcedureBlock>1</ProcedureBlock>
-<PublicList>QU</PublicList>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	set ..GebruikerID = "4682||"_$get(QU(1),0)
-	Quit $$$OK
-]]></Implementation>
-</Method>
 </Class>