Index: APPS/EC/impl/ConfiguratorService/ConfiguratorServiceTemplate.cls.xml
===================================================================
diff -u -r30024 -r30033
--- APPS/EC/impl/ConfiguratorService/ConfiguratorServiceTemplate.cls.xml	(.../ConfiguratorServiceTemplate.cls.xml)	(revision 30024)
+++ APPS/EC/impl/ConfiguratorService/ConfiguratorServiceTemplate.cls.xml	(.../ConfiguratorServiceTemplate.cls.xml)	(revision 30033)
@@ -182,12 +182,7 @@
 <ReturnTypeParams>ELEMENTTYPE="APPS.PM.Maatwerk.MaatwerkDefaultsToepasser"</ReturnTypeParams>
 <Implementation><![CDATA[
 	Set DefaultsToepassers=##class(%ListOfObjects).%New()
-	If $IsObject(Winkelkar) {
-		Do DefaultsToepassers.Insert(..GeefMaatwerkDefaultsViaWinkelkarToepasser(Winkelkar))
-		If $IsObject(Winkelkar.Personality) {
-			Do DefaultsToepassers.Insert(##class(APPS.PM.Maatwerk.impl.MaatwerkDefaultsViaPersonalityToepasser).%New(Winkelkar.Personality.ID))
-		}
-	}
+	Do:$IsObject(Winkelkar) DefaultsToepassers.Insert(..GeefMaatwerkDefaultsViaWinkelkarToepasser(Winkelkar))
 	
 	Do DefaultsToepassers.Insert(##class(APPS.PM.Maatwerk.impl.MaatwerkDefaultsViaGebruikerToepasser).%New(Pad))
 	Do DefaultsToepassers.Insert(##class(APPS.PM.Maatwerk.impl.MaatwerkDefaultsViaProductProgrammaToepasser).%New())