diff --git a/source/java/org/alfresco/web/ui/common/component/UIOutputText.java b/source/java/org/alfresco/web/ui/common/component/UIOutputText.java
index eb5eb999f1..459190cc63 100644
--- a/source/java/org/alfresco/web/ui/common/component/UIOutputText.java
+++ b/source/java/org/alfresco/web/ui/common/component/UIOutputText.java
@@ -50,6 +50,29 @@ public class UIOutputText extends UIOutput
       return "org.alfresco.faces.OutputText";
    }
    
+   /**
+    * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object)
+    */
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[])state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+      this.encodeForJavaScript = (Boolean)values[1];
+   }
+   
+   /**
+    * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext)
+    */
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[3];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      values[1] = this.encodeForJavaScript;
+      return values;
+   }
+   
    /**
     * Sets whether the text should be encoded for JavaScript consumption
     * 
diff --git a/source/web/jsp/wizard/new-rule/condition.jsp b/source/web/jsp/wizard/new-rule/condition.jsp
index bf17c14538..9f22720ba7 100644
--- a/source/web/jsp/wizard/new-rule/condition.jsp
+++ b/source/web/jsp/wizard/new-rule/condition.jsp
@@ -245,7 +245,7 @@
        </tr>
     </table>
     
-    <script language="JavaScript1.5">
+    <script language="JavaScript">
       function itemSelected(inputField)
       {
          if (inputField.selectedIndex == 0)