diff --git a/classes/expressions/LimeExpressionManager.php b/classes/expressions/LimeExpressionManager.php
index fd6d41d65f8..583b4a56905 100644
--- a/classes/expressions/LimeExpressionManager.php
+++ b/classes/expressions/LimeExpressionManager.php
@@ -2343,6 +2343,12 @@ private function setVariableAndTokenMappingsForExpressionManager($surveyid,$forc
             {
                 //Gather survey data for tokenised surveys, for use in presenting questions
                 $_SESSION['thistoken']=getTokenData($surveyid, $_SESSION['token']);
+                $this->knownVars['TOKEN:TOKEN'] = array(
+                    'code'=>$_SESSION['token'],
+                    'jsName_on'=>'',
+                    'jsName'=>'',
+                    'readWrite'=>'N',
+                );
             }
             if (isset($_SESSION['thistoken']))
             {
@@ -2380,6 +2386,7 @@ private function setVariableAndTokenMappingsForExpressionManager($surveyid,$forc
                 $this->knownVars['TOKEN:LASTNAME'] = $blankVal;
                 $this->knownVars['TOKEN:EMAIL'] = $blankVal;
                 $this->knownVars['TOKEN:USESLEFT'] = $blankVal;
+                $this->knownVars['TOKEN:TOKEN'] = $blankVal;
                 for ($i=1;$i<=100;++$i) // TODO - is there a way to know  how many attributes are set?  Looks like max is 100
                 {
                     $this->knownVars['TOKEN:ATTRIBUTE_' . $i] = $blankVal;