diff --git a/application/helpers/replacements_helper.php b/application/helpers/replacements_helper.php
index 836f9431fc8..3d8cef45e05 100644
--- a/application/helpers/replacements_helper.php
+++ b/application/helpers/replacements_helper.php
@@ -119,6 +119,7 @@ function templatereplace($line, $replacements = array(), &$redata = array(), $de
     }
     if(!isset($templatedir)) $templatedir = getTemplatePath($templatename);
     if(!isset($templateurl)) $templateurl = getTemplateURL($templatename)."/";
+    if (!$anonymized && isset($thissurvey['anonymized'])) $anonymized=($thissurvey['anonymized']=="Y");
 
     // TEMPLATECSS and TEMPLATEJS
     $_templatecss="";$_templatejs="";
@@ -854,7 +855,7 @@ function templatereplace($line, $replacements = array(), &$redata = array(), $de
     $coreReplacements['TEMPLATEJS'] = $_templatejs;
     $coreReplacements['TEMPLATEURL'] = $templateurl;
     $coreReplacements['THEREAREXQUESTIONS'] = $_therearexquestions;
-    if (!$anonymized) $coreReplacements['TOKEN'] = $_token;
+    $coreReplacements['TOKEN'] = (!$anonymized ? $_token : '');// Silently replace TOKEN by empty string
     $coreReplacements['URL'] = $_linkreplace;
     $coreReplacements['WELCOME'] = (isset($thissurvey['welcome']) ? $thissurvey['welcome'] : '');