Index: DOM/AKP/impl/DataM/DataMToelevering.cls.xml
===================================================================
diff -u -r53220 -r53228
--- DOM/AKP/impl/DataM/DataMToelevering.cls.xml	(.../DataMToelevering.cls.xml)	(revision 53220)
+++ DOM/AKP/impl/DataM/DataMToelevering.cls.xml	(.../DataMToelevering.cls.xml)	(revision 53228)
@@ -289,15 +289,7 @@
 <Implementation><![CDATA[
 	#dim Personality As DOM.common.Personality
 	Try {
-		If $$$HasLength(..GeefOorsprongKetting()) {
-			Set Personality = ..EindPersonalityBepaler.GeefEindPersonality(..GeefOorsprongKetting())
-		} 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())
-			}
-		}
+		Set Personality = ..EindPersonalityBepaler.GeefEindPersonality(..GeefOorsprongKetting(), ..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())