diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/email/EntityTrackingEmailGenerator.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/email/EntityTrackingEmailGenerator.java
index b6ecc8530940b3d9b90520f4ee4094c91db1a926..d8ed6c0b4290b7d5f7a72b467027fed257d63931 100644
--- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/email/EntityTrackingEmailGenerator.java
+++ b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/email/EntityTrackingEmailGenerator.java
@@ -252,14 +252,12 @@ public class EntityTrackingEmailGenerator implements IEntityTrackingEmailGenerat
             appendProperties(sb, dataSet.getProperties());
         }
 
-        private static String tryGetSamplePropertyValue(Sample sequencingSample,
-                String externalSampleNamePropertyCode)
+        private static String tryGetSamplePropertyValue(Sample sequencingSample, String propertyCode)
         {
             String result = null;
             for (IEntityProperty property : sequencingSample.getProperties())
             {
-                final String propertyCode = property.getPropertyType().getCode();
-                if (propertyCode.equals(EXTERNAL_SAMPLE_NAME_PROPERTY_CODE))
+                if (property.getPropertyType().getCode().equals(propertyCode))
                 {
                     result = StringEscapeUtils.unescapeHtml(property.getValue());
                     break;