diff --git a/application/helpers/frontend_helper.php b/application/helpers/frontend_helper.php
index d8984055d4c..be3479e3a89 100644
--- a/application/helpers/frontend_helper.php
+++ b/application/helpers/frontend_helper.php
@@ -1667,14 +1667,6 @@ function doAssessment($surveyid)
 
         $assessment['subtotal_score'] = (isset($subtotal)) ? $subtotal : '';
         $assessment['total_score']    = (isset($total)) ? $total : '';
-        // token data for placeholder replacements
-        $token = Token::model($surveyid)->findByAttributes(array('token' => $_SESSION['survey_'.$surveyid]['token']));
-        if ($token !== null){
-            $assessment['token']['email'] = $survey->anonymized === 'N'?$token->email:'';
-            $assessment['token']['firstname'] = $survey->anonymized === 'N'?$token->firstname:'';
-            $assessment['token']['lastname'] = $survey->anonymized === 'N'?$token->lastname:'';
-            $assessment['token']['token'] = $survey->anonymized === 'N'?$token->token:'';
-        }
         //$aDatas     = array('total' => $total, 'assessment' => $assessment, 'subtotal' => $subtotal, );
         return array('show'=>($assessment['subtotal']['show'] || $assessment['total']['show']), 'datas' => $assessment);
 
diff --git a/themes/survey/vanilla/views/subviews/messages/assessments.twig b/themes/survey/vanilla/views/subviews/messages/assessments.twig
index 7f10979df10..3bbee51de3d 100644
--- a/themes/survey/vanilla/views/subviews/messages/assessments.twig
+++ b/themes/survey/vanilla/views/subviews/messages/assessments.twig
@@ -47,7 +47,7 @@
 
                                     <tr  {{ aSurveyInfo.attr.assessmentstabletr }} >
                                         <td {{ aSurveyInfo.attr.assessmentstabletd }} >
-                                            {{ str_replace( [ "{PERC}", "{TOTAL}", "{ASSESSMENT_CURRENT_TOTAL}", "{EMAIL}", "{FIRSTNAME}", "{LASTNAME}", "{TOKEN}" ], [ val, aAssessments.total_score, aAssessments.total_score, aAssessments.token.email, aAssessments.token.firstname, aAssessments.token.lastname, aAssessments.token.token ], assessed.message)  }}
+                                            {{ str_replace( [ "{PERC}", "{TOTAL}", "{ASSESSMENT_CURRENT_TOTAL}" ], [ val, aAssessments.total_score, aAssessments.total_score  ], assessed.message)  }}
                                         </td>
                                     </tr>
                                 </table>
@@ -73,7 +73,7 @@
                             </tr>
                             <tr {{ aSurveyInfo.attr.assessmentstablettr }}>
                                 <td {{ aSurveyInfo.attr.assessmentstablettd }}>
-                                    {{ str_replace( [ "{PERC}", "{TOTAL}", "{ASSESSMENT_CURRENT_TOTAL}", "{EMAIL}", "{FIRSTNAME}", "{LASTNAME}", "{TOKEN}" ], [ val, aAssessments.total_score, aAssessments.total_score, aAssessments.token.email, aAssessments.token.firstname, aAssessments.token.lastname, aAssessments.token.token ], assessed.message)  }}
+                                    {{ str_replace( [ "{PERC}", "{TOTAL}", "{ASSESSMENT_CURRENT_TOTAL}" ], [ val, aAssessments.total_score, aAssessments.total_score ], assessed.message)  }}
                                 </td>
                             </tr>
                         </table>