Index: DOM/VKP/impl/DataM/DataMBonAbstract.cls.xml
===================================================================
diff -u -r53190 -r53228
--- DOM/VKP/impl/DataM/DataMBonAbstract.cls.xml	(.../DataMBonAbstract.cls.xml)	(revision 53190)
+++ DOM/VKP/impl/DataM/DataMBonAbstract.cls.xml	(.../DataMBonAbstract.cls.xml)	(revision 53228)
@@ -395,17 +395,8 @@
 <Method name="GeefEindPersonality">
 <ReturnType>DOM.common.Personality</ReturnType>
 <Implementation><![CDATA[
-	#dim Personality As DOM.common.Personality
 	Try {
-		If $$$HasLength($Piece(..NodeHoofding,"\",59)) {
-			Set Personality = ..EindPersonalityBepaler.GeefEindPersonality($Piece(..NodeHoofding,"\",59))
-		} Else {
-			If ..GeefKlantID() = ##class(DOM.VKP.enu.Klant).HaefeleNederland() {
-				Set Personality = ##class(DOM.common.impl.PersonalityRepository).%New().GeefViaID(##class(DOM.common.enu.Personality).HaefeleNL())
-			} Else {
-				Set Personality = ##class(DOM.common.impl.PersonalityRepository).%New().GeefViaID(##class(DOM.common.enu.Personality).VanHoecke())
-			}
-		}
+		#dim Personality As DOM.common.Personality = ..EindPersonalityBepaler.GeefEindPersonality($Piece(..NodeHoofding,"\",59), ..GeefKlantID())
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		Set Personality = ##class(DOM.common.impl.PersonalityRepository).%New().GeefViaID(##class(DOM.common.enu.Personality).VanHoecke())