Index: AXimpl/Utils/KlantIdConverter.cls.xml
===================================================================
diff -u -r49329 -r50061
--- AXimpl/Utils/KlantIdConverter.cls.xml	(.../KlantIdConverter.cls.xml)	(revision 49329)
+++ AXimpl/Utils/KlantIdConverter.cls.xml	(.../KlantIdConverter.cls.xml)	(revision 50061)
@@ -20,7 +20,12 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If (##class(TECH.Config.ConfigMgr).Instance().GetBoolean("KlantIdAx2A") && (PersonalityId = ##class(DOM.common.enu.Personality).VanHoecke())) {
-		Set KlantId = ##class(TECH.StringUtils).AlignRight($Extract(KlantId, 4, *), 0, 5)
+		If ##class(TECH.StringUtils).StartsWith(KlantId,"K||") {
+			Set KlantId = ##class(TECH.StringUtils).AlignRight($Extract(KlantId, 4, *), 0, 5)
+		} Else {
+			Set KlantId = ##class(TECH.StringUtils).AlignRight(+KlantId, 0, 5)
+		}
+
 	}
 	
 	Quit KlantId