diff --git a/bundles/ch.elexis.laborimport.medics.v2/src/ch/elexis/labor/medics/v2/order/LabOrderActionHl7.java b/bundles/ch.elexis.laborimport.medics.v2/src/ch/elexis/labor/medics/v2/order/LabOrderActionHl7.java
index 413cb1fb7b..855a4dea50 100644
--- a/bundles/ch.elexis.laborimport.medics.v2/src/ch/elexis/labor/medics/v2/order/LabOrderActionHl7.java
+++ b/bundles/ch.elexis.laborimport.medics.v2/src/ch/elexis/labor/medics/v2/order/LabOrderActionHl7.java
@@ -13,12 +13,13 @@
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.widgets.Shell;
 
+import ch.elexis.core.data.activator.CoreHub;
 import ch.elexis.core.data.events.ElexisEventDispatcher;
 import ch.elexis.core.model.ch.BillingLaw;
 import ch.elexis.core.model.util.ElexisIdGenerator;
-import ch.elexis.core.services.holder.ContextServiceHolder;
 import ch.elexis.core.ui.Hub;
 import ch.elexis.core.ui.util.SWTHelper;
+import ch.elexis.data.Anwender;
 import ch.elexis.data.Fall;
 import ch.elexis.data.Kontakt;
 import ch.elexis.data.Patient;
@@ -263,8 +264,8 @@ private String writeHL7File(final Patient patient, final Kontakt rechnungsempfae
 		String uniqueProcessingID = ElexisIdGenerator.generateId();
 
 		HL7Mandant mandant = new HL7Mandant();
-		mandant.setLabel(ContextServiceHolder.getActiveMandatorOrThrow().getLabel());
-		mandant.setEan(ContextServiceHolder.getActiveMandatorOrThrow().getXid(DOMAIN_EAN).getDomainId());
+		mandant.setLabel(CoreHub.actMandant.get(Anwender.FLD_LABEL));
+		mandant.setEan(CoreHub.actMandant.getXid(DOMAIN_EAN));
 
 		HL7_OML_O21 omlO21 = new HL7_OML_O21("CHELEXIS", "PATDATA", Messages.LabOrderAction_receivingApplication,
 				StringUtils.EMPTY, Messages.LabOrderAction_receivingFacility, uniqueMessageControlID,