Index: DOM/common/impl/PersonalityService.cls.xml
===================================================================
diff -u -r46621 -r46657
--- DOM/common/impl/PersonalityService.cls.xml	(.../PersonalityService.cls.xml)	(revision 46621)
+++ DOM/common/impl/PersonalityService.cls.xml	(.../PersonalityService.cls.xml)	(revision 46657)
@@ -72,14 +72,24 @@
 <Method name="GeefKlantCodeViaKlantId">
 <FormalSpec>Personality:DOM.common.Personality,KlantId:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ##class(TECH.StringUtils).StripFirstPart(KlantId,Personality.GeefPrefix())
+<Implementation><![CDATA[
+	Quit:(Personality.GeefID()=##class(DOM.common.enu.Personality).VanHoecke()) ##class(TECH.StringUtils).StripFirstPart(KlantId,"K||")
+	
+	Quit:(Personality.GeefID()=##class(DOM.common.enu.Personality).VanHoeckeVoorHalux()) ##class(TECH.StringUtils).StripFirstPart(KlantId,"K||")
+	
+	Quit ##class(TECH.StringUtils).StripFirstPart(KlantId,Personality.GeefPrefix())
 ]]></Implementation>
 </Method>
 
 <Method name="GeefKlantIdViaKlantCode">
 <FormalSpec>Personality:DOM.common.Personality,KlantCode:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit Personality.GeefPrefix()_KlantCode
+<Implementation><![CDATA[
+	Quit:(Personality.GeefID()=##class(DOM.common.enu.Personality).VanHoecke()) "K||"_KlantCode
+	
+	Quit:(Personality.GeefID()=##class(DOM.common.enu.Personality).VanHoeckeVoorHalux()) "K||"_KlantCode
+	
+	Quit Personality.GeefPrefix()_KlantCode
 ]]></Implementation>
 </Method>
 </Class>