diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
index 1041fdc35af..cc8c21e82ce 100644
--- a/application/helpers/qanda_helper.php
+++ b/application/helpers/qanda_helper.php
@@ -2519,7 +2519,7 @@ function do_multiplechoice($ia)
         $answer .= " if(this.checked===true) { document.getElementById(\"answer$myfname\").focus(); }; LEMflagMandOther(\"$myfname\",this.checked);";
         $answer .= "' />
         <label for=\"answer$myfname\" class=\"answertext\">".$othertext."</label>
-        <input class=\"text ".$kpclass."\" type=\"text\" name=\"$myfname\" id=\"answer$myfname\"";
+        <input class=\"text ".$kpclass."\" type=\"text\" name=\"$myfname\" id=\"answer$myfname\" value=\"";
         if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]))
         {
             $dispVal = $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname];
@@ -2527,9 +2527,9 @@ function do_multiplechoice($ia)
             {
                 $dispVal = str_replace('.',$sSeperator,$dispVal);
             }
-            $answer .= ' value="'.htmlspecialchars($dispVal,ENT_QUOTES).'"';
+            $answer .= htmlspecialchars($dispVal,ENT_QUOTES);
         }
-        $answer .= " onchange='$(\"#java{$myfname}\").val(this.value);$oth_checkconditionFunction(this.value, this.name, this.type);if ($.trim($(\"#java{$myfname}\").val())!=\"\") { \$(\"#answer{$myfname}cbox\").attr(\"checked\",\"checked\"); } else { \$(\"#answer{$myfname}cbox\").attr(\"checked\",\"\"); }; LEMflagMandOther(\"$myfname\",this.checked);' $numbersonly />";
+        $answer .= "\" onchange='$(\"#java{$myfname}\").val(this.value);$oth_checkconditionFunction(this.value, this.name, this.type);if ($.trim($(\"#java{$myfname}\").val())!=\"\") { \$(\"#answer{$myfname}cbox\").attr(\"checked\",\"checked\"); } else { \$(\"#answer{$myfname}cbox\").attr(\"checked\",\"\"); }; LEMflagMandOther(\"$myfname\",this.checked);' $numbersonly />";
         $answer .= '<input type="hidden" name="java'.$myfname.'" id="java'.$myfname.'" value="';
 
         //        if ($maxansw > 0)
diff --git a/scripts/survey_runtime.js b/scripts/survey_runtime.js
index 3c8115eb63e..962a3fd8356 100644
--- a/scripts/survey_runtime.js
+++ b/scripts/survey_runtime.js
@@ -2,9 +2,9 @@ var DOM1;
 $(document).ready(function()
 {
 
-	// Jquery-ui avigation buttons
+	// Jquery-ui navigation buttons
     navbuttonsJqueryUi();
-
+    addClassEmpty();
 	DOM1 = (typeof document.getElementsByTagName!='undefined');
     if (typeof LEMsetTabIndexes === 'function') { LEMsetTabIndexes(); }
 	if (typeof checkconditions!='undefined') checkconditions();
@@ -156,6 +156,32 @@ function navbuttonsJqueryUi(){
     $('#movesubmitbtn, input.saveall, input.clearall').button();
 }
 
+// Put a empty class on empty answer text item (limit to answers part)
+function addClassEmpty(){
+      $('.answer-item input.text[value=""]').addClass('empty');
+      $('.answer-item input[type=text][value=""]').addClass('empty');
+      $('.answer-item textarea').each(function(index) {
+        if ($(this).val() == ""){
+          $(this).addClass('empty');
+        }
+      });
+
+    $(".answer-item input.text,.text-item input[type=text]").live("blur", function(){ 
+      if ($(this).val() == ""){
+        $(this).addClass('empty');
+      }else{
+        $(this).removeClass('empty');
+      }
+    });
+    $(".answer-item textarea").live("blur", function(){ 
+      if ($(this).val() == ""){
+        $(this).addClass('empty');
+      }else{
+        $(this).removeClass('empty');
+      }
+    });
+}
+
 
 gmaps = new Object;
 osmaps = new Object;
diff --git a/templates/citronade/template.js b/templates/citronade/template.js
index f500c583a7d..0cbaac3ab52 100644
--- a/templates/citronade/template.js
+++ b/templates/citronade/template.js
@@ -41,31 +41,6 @@ function autoDisabledComment(){
   });
 }
 
-// Add empty class to input text and textarea
-function addClassEmpty(){
-      $('.answers-wrapper input.text[value=""]').addClass('empty');
-      $('.answers-wrapper input[type=text][value=""]').addClass('empty');
-      $('.answers-wrapper textarea').each(function(index) {
-        if ($(this).val() == ""){
-          $(this).addClass('empty');
-        }
-      });
-
-    $("input.text,input[type=text]").live("blur", function(){ 
-      if ($(this).val() == ""){
-        $(this).addClass('empty');
-      }else{
-        $(this).removeClass('empty');
-      }
-    });
-    $("textarea").live("blur", function(){ 
-      if ($(this).val() == ""){
-        $(this).addClass('empty');
-      }else{
-        $(this).removeClass('empty');
-      }
-    });
-}
 // Replace common alert with jquery-ui dialog
 function jalert(text) {
 	var $dialog = $('<div></div>')
@@ -88,8 +63,6 @@ function jalert(text) {
 
 $(document).ready(function(){
   //autoDisabledComment();
-  addClassEmpty();
-
 })