diff --git a/gulliver/js/form/core/form.js b/gulliver/js/form/core/form.js
index 236a715a7..a2a1a194b 100644
--- a/gulliver/js/form/core/form.js
+++ b/gulliver/js/form/core/form.js
@@ -1406,6 +1406,7 @@ function showRow( element ){
     var row=getRow(element);
     requiredFields = [];
     sRequiredFields = document.getElementById('DynaformRequiredFields').value.replace(/%27/gi, '"');
+    sRequiredFields = document.getElementById('DynaformRequiredFields').value.replace(/%39/gi, "'");        
     
     fields = new String(sRequiredFields);
     fields = stripslashes(fields);
@@ -1604,7 +1605,9 @@ var validateForm = function(sRequiredFields) {
   if( typeof(sRequiredFields) != 'object' || sRequiredFields.indexOf("%27") > 0 ){
     sRequiredFields = sRequiredFields.replace(/%27/gi, '"');
   }
-
+  if( typeof(sRequiredFields) != 'object' || sRequiredFields.indexOf("%39") > 0 ){
+    sRequiredFields = sRequiredFields.replace(/%39/gi, "'");
+  }
     aRequiredFields = eval(sRequiredFields);
 
     var sMessage = '';
diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php
index 500e651b5..bdd669860 100644
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -3778,7 +3778,7 @@ class XmlForm
       }
       //var_dump($this->requiredFields);
       $oJSON = new Services_JSON ( );
-      $this->objectRequiredFields =  str_replace('"', "%27", $oJSON->encode ( $this->requiredFields ));
+      $this->objectRequiredFields =  str_replace('"', "%27", str_replace("'", "%39", $oJSON->encode ( $this->requiredFields )) );
 
       //Load the default values
       //$this->setDefaultValues();