diff --git a/components/ILIAS/ScormAicc/classes/class.ilScormMailTemplateLPContext.php b/components/ILIAS/ScormAicc/classes/class.ilScormMailTemplateLPContext.php
index dc306f1399b6..2aaaa24235dc 100755
--- a/components/ILIAS/ScormAicc/classes/class.ilScormMailTemplateLPContext.php
+++ b/components/ILIAS/ScormAicc/classes/class.ilScormMailTemplateLPContext.php
@@ -136,10 +136,6 @@ public function resolveSpecificPlaceholder(
         global $DIC;
         $ilObjDataCache = $DIC['ilObjDataCache'];
 
-        if (!in_array($placeholder_id, ['sahs_title', 'sahs_link'])) {
-            return '';
-        }
-
         $obj_id = $ilObjDataCache->lookupObjId((int) $context_parameters['ref_id']);
         $tracking = new ilObjUserTracking();
 
@@ -154,6 +150,7 @@ public function resolveSpecificPlaceholder(
                 if ($recipient === null) {
                     return '';
                 }
+
                 $status = ilLPStatus::_lookupStatus($obj_id, $recipient->getId());
                 if (!$status) {
                     $status = ilLPStatus::LP_STATUS_NOT_ATTEMPTED_NUM;
@@ -167,7 +164,9 @@ public function resolveSpecificPlaceholder(
                 if ($recipient === null) {
                     return '';
                 }
+
                 $mark = ilLPMarks::_lookupMark($recipient->getId(), $obj_id);
+
                 return trim($mark) !== '' ? $mark : '-';
 
             case 'scorm_score':
@@ -190,6 +189,7 @@ public function resolveSpecificPlaceholder(
                         $scores[] = $item['title'] . ': ' . $item['score'];
                     }
                 }
+
                 return implode("\n", $scores);
 
             case 'scorm_time_spent':