diff --git a/source/java/org/alfresco/web/ui/common/Utils.java b/source/java/org/alfresco/web/ui/common/Utils.java
index 0eb01e30dc..8761feb15b 100644
--- a/source/java/org/alfresco/web/ui/common/Utils.java
+++ b/source/java/org/alfresco/web/ui/common/Utils.java
@@ -76,7 +76,7 @@ import org.alfresco.web.data.IDataContainer;
 import org.alfresco.web.ui.common.component.UIStatusMessage;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.renderkit.html.HtmlFormRendererBase;
+import org.apache.myfaces.shared_impl.renderkit.html.HtmlFormRendererBase;
 import org.springframework.web.jsf.FacesContextUtils;
 
 /**
@@ -503,7 +503,7 @@ public final class Utils
             
             // weak, but this seems to be the way Sun RI do it...
             //FormRenderer.addNeededHiddenField(context, name);
-            HtmlFormRendererBase.addHiddenCommandParameter(form, name);
+            HtmlFormRendererBase.addHiddenCommandParameter(context, form, name);
          }
       }
       
@@ -520,7 +520,7 @@ public final class Utils
       
       // weak, but this seems to be the way Sun RI do it...
       //FormRenderer.addNeededHiddenField(context, fieldId);
-      HtmlFormRendererBase.addHiddenCommandParameter(form, fieldId);
+      HtmlFormRendererBase.addHiddenCommandParameter(context, form, fieldId);
       
       return buf.toString();
    }
diff --git a/source/java/org/alfresco/web/ui/repo/component/UIActions.java b/source/java/org/alfresco/web/ui/repo/component/UIActions.java
index 6dbabc1b70..34aafe12bd 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UIActions.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UIActions.java
@@ -57,7 +57,7 @@ import org.alfresco.web.ui.repo.component.evaluator.ActionInstanceEvaluator;
 import org.alfresco.web.ui.repo.component.evaluator.PermissionEvaluator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.taglib.UIComponentTagUtils;
+import org.apache.myfaces.shared_impl.taglib.UIComponentTagUtils;
 
 /**
  * @author kevinr
diff --git a/source/web/WEB-INF/web.xml b/source/web/WEB-INF/web.xml
index 8f6523e071..49e0f8c1a6 100644
--- a/source/web/WEB-INF/web.xml
+++ b/source/web/WEB-INF/web.xml
@@ -29,6 +29,12 @@
       <param-value>false</param-value>
       <description>This is an EXPERIMENTAL feature, so leave it off for now!</description>
    </context-param>
+   
+   <context-param>
+      <param-name>org.apache.myfaces.SERIALIZE_STATE_IN_SESSION</param-name>
+      <param-value>false</param-value>
+      <description>Stop MyFaces from Serializing the state to the session</description>
+   </context-param>
 
     <!-- TODO: Change this to false for production -->
     <context-param>
diff --git a/source/web/jsp/actions/add-features.jsp b/source/web/jsp/actions/add-features.jsp
index bb5f0f30a9..db4bb80482 100644
--- a/source/web/jsp/actions/add-features.jsp
+++ b/source/web/jsp/actions/add-features.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="add-features-action">
+   <h:form acceptcharset="UTF-8" id="add-features-action">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/actions/check-in.jsp b/source/web/jsp/actions/check-in.jsp
index 7f0c9f0e82..bdaf4df975 100644
--- a/source/web/jsp/actions/check-in.jsp
+++ b/source/web/jsp/actions/check-in.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="check-in-action">
+   <h:form acceptcharset="UTF-8" id="check-in-action">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/actions/check-out.jsp b/source/web/jsp/actions/check-out.jsp
index 10cf190736..7a9488a531 100644
--- a/source/web/jsp/actions/check-out.jsp
+++ b/source/web/jsp/actions/check-out.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="check-out-action">
+   <h:form acceptcharset="UTF-8" id="check-out-action">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/actions/copy.jsp b/source/web/jsp/actions/copy.jsp
index 9223a87f26..ae516b9c74 100644
--- a/source/web/jsp/actions/copy.jsp
+++ b/source/web/jsp/actions/copy.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="copy-action">
+   <h:form acceptcharset="UTF-8" id="copy-action">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/actions/import.jsp b/source/web/jsp/actions/import.jsp
index 36e75c98f1..948afade00 100644
--- a/source/web/jsp/actions/import.jsp
+++ b/source/web/jsp/actions/import.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="import-action">
+   <h:form acceptcharset="UTF-8" id="import-action">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/actions/link-category.jsp b/source/web/jsp/actions/link-category.jsp
index 3e39c1fcb7..024db983c2 100644
--- a/source/web/jsp/actions/link-category.jsp
+++ b/source/web/jsp/actions/link-category.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="link-category-action">
+   <h:form acceptcharset="UTF-8" id="link-category-action">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/actions/mail.jsp b/source/web/jsp/actions/mail.jsp
index 2649f129e0..78f5cf0dc9 100644
--- a/source/web/jsp/actions/mail.jsp
+++ b/source/web/jsp/actions/mail.jsp
@@ -63,7 +63,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="email-action">
+   <h:form acceptcharset="UTF-8" id="email-action">
       
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/actions/move.jsp b/source/web/jsp/actions/move.jsp
index 3907220372..ce69d3dc0c 100644
--- a/source/web/jsp/actions/move.jsp
+++ b/source/web/jsp/actions/move.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="move-action">
+   <h:form acceptcharset="UTF-8" id="move-action">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/actions/remove-features.jsp b/source/web/jsp/actions/remove-features.jsp
index 9bb6967edf..b505527e3a 100644
--- a/source/web/jsp/actions/remove-features.jsp
+++ b/source/web/jsp/actions/remove-features.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="remove-feature-action">
+   <h:form acceptcharset="UTF-8" id="remove-feature-action">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/actions/script.jsp b/source/web/jsp/actions/script.jsp
index 0ea08524fb..d4ee8f7c45 100644
--- a/source/web/jsp/actions/script.jsp
+++ b/source/web/jsp/actions/script.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="script-action">
+   <h:form acceptcharset="UTF-8" id="script-action">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/actions/simple-workflow.jsp b/source/web/jsp/actions/simple-workflow.jsp
index e6f751dadd..4373e081ea 100644
--- a/source/web/jsp/actions/simple-workflow.jsp
+++ b/source/web/jsp/actions/simple-workflow.jsp
@@ -78,7 +78,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="simple-workflow-action">
+   <h:form acceptcharset="UTF-8" id="simple-workflow-action">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/actions/specialise-type.jsp b/source/web/jsp/actions/specialise-type.jsp
index 6db57c808b..e1265f2153 100644
--- a/source/web/jsp/actions/specialise-type.jsp
+++ b/source/web/jsp/actions/specialise-type.jsp
@@ -53,7 +53,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="specialise-type-action">
+   <h:form acceptcharset="UTF-8" id="specialise-type-action">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/actions/transform-image.jsp b/source/web/jsp/actions/transform-image.jsp
index 7bf4f0eeec..51656857d8 100644
--- a/source/web/jsp/actions/transform-image.jsp
+++ b/source/web/jsp/actions/transform-image.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="transform-image-action">
+   <h:form acceptcharset="UTF-8" id="transform-image-action">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/actions/transform.jsp b/source/web/jsp/actions/transform.jsp
index a0637a24cb..fceb32ac79 100644
--- a/source/web/jsp/actions/transform.jsp
+++ b/source/web/jsp/actions/transform.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="transform-action">
+   <h:form acceptcharset="UTF-8" id="transform-action">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/admin/admin-console.jsp b/source/web/jsp/admin/admin-console.jsp
index 4bf58d13d5..e72c5799e5 100644
--- a/source/web/jsp/admin/admin-console.jsp
+++ b/source/web/jsp/admin/admin-console.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="admin-console">
+   <h:form acceptcharset="UTF-8" id="admin-console">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/browse/browse.jsp b/source/web/jsp/browse/browse.jsp
index 61cc5e1486..16175ff9ff 100644
--- a/source/web/jsp/browse/browse.jsp
+++ b/source/web/jsp/browse/browse.jsp
@@ -74,7 +74,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="browse">
+   <h:form acceptcharset="UTF-8" id="browse">
    
    <%-- Main outer table --%>
    <table cellspacing=0 cellpadding=2>
diff --git a/source/web/jsp/browse/dashboard.jsp b/source/web/jsp/browse/dashboard.jsp
index 323d73f856..f0f3802925 100644
--- a/source/web/jsp/browse/dashboard.jsp
+++ b/source/web/jsp/browse/dashboard.jsp
@@ -41,7 +41,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="dashboard">
+   <h:form acceptcharset="UTF-8" id="dashboard">
    
    <%-- Main outer table --%>
    <table cellspacing=0 cellpadding=2>
diff --git a/source/web/jsp/categories/categories.jsp b/source/web/jsp/categories/categories.jsp
index 71405bede4..c358f5cdc3 100644
--- a/source/web/jsp/categories/categories.jsp
+++ b/source/web/jsp/categories/categories.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="users">
+   <h:form acceptcharset="UTF-8" id="users">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/categories/delete-category.jsp b/source/web/jsp/categories/delete-category.jsp
index 5552293b75..135f27297e 100644
--- a/source/web/jsp/categories/delete-category.jsp
+++ b/source/web/jsp/categories/delete-category.jsp
@@ -40,7 +40,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="delete-category">
+   <h:form acceptcharset="UTF-8" id="delete-category">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/categories/edit-category.jsp b/source/web/jsp/categories/edit-category.jsp
index f08e8e6422..65671f29dd 100644
--- a/source/web/jsp/categories/edit-category.jsp
+++ b/source/web/jsp/categories/edit-category.jsp
@@ -63,7 +63,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="edit-category">
+   <h:form acceptcharset="UTF-8" id="edit-category">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/categories/new-category.jsp b/source/web/jsp/categories/new-category.jsp
index cbcd0eb621..44e958f6f2 100644
--- a/source/web/jsp/categories/new-category.jsp
+++ b/source/web/jsp/categories/new-category.jsp
@@ -63,7 +63,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="new-category">
+   <h:form acceptcharset="UTF-8" id="new-category">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/content/add-content-dialog.jsp b/source/web/jsp/content/add-content-dialog.jsp
index da3ce5391f..2a89cc67f8 100644
--- a/source/web/jsp/content/add-content-dialog.jsp
+++ b/source/web/jsp/content/add-content-dialog.jsp
@@ -54,7 +54,7 @@ if (dialog != null && dialog.getFileName() != null)
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="add-content-upload-start">
+   <h:form acceptcharset="UTF-8" id="add-content-upload-start">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
@@ -169,7 +169,7 @@ if (dialog != null && dialog.getFileName() != null)
                                  </r:uploadForm>
                                  <% } %>
                                  
-                                 <h:form acceptCharset="UTF-8" id="add-content-upload-end" onsubmit="return validate();">
+                                 <h:form acceptcharset="UTF-8" id="add-content-upload-end" onsubmit="return validate();">
                                  <% if (fileUploaded) { %>
                                  <tr>
                                     <td colspan="3">
diff --git a/source/web/jsp/dashboards/container-light.jsp b/source/web/jsp/dashboards/container-light.jsp
index 5862e72fe7..14d4b28acc 100644
--- a/source/web/jsp/dashboards/container-light.jsp
+++ b/source/web/jsp/dashboards/container-light.jsp
@@ -40,7 +40,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
 
-   <h:form acceptCharset="UTF-8" id="dashboard">
+   <h:form acceptcharset="UTF-8" id="dashboard">
    
    <table cellspacing="0" cellpadding="0" border="0" width="100%">
       <tr>
diff --git a/source/web/jsp/dashboards/container.jsp b/source/web/jsp/dashboards/container.jsp
index 36fc18b4e7..f825bd6cb3 100644
--- a/source/web/jsp/dashboards/container.jsp
+++ b/source/web/jsp/dashboards/container.jsp
@@ -47,7 +47,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
 
-   <h:form acceptCharset="UTF-8" id="dashboard">
+   <h:form acceptcharset="UTF-8" id="dashboard">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/about.jsp b/source/web/jsp/dialog/about.jsp
index 753d8003bf..b8f4b030e9 100644
--- a/source/web/jsp/dialog/about.jsp
+++ b/source/web/jsp/dialog/about.jsp
@@ -40,7 +40,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    <f:loadBundle basename="alfresco.version" var="version"/>
    
-   <h:form acceptCharset="UTF-8" id="about">
+   <h:form acceptcharset="UTF-8" id="about">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/advanced-search.jsp b/source/web/jsp/dialog/advanced-search.jsp
index 1c1b958acf..b87fa259e8 100644
--- a/source/web/jsp/dialog/advanced-search.jsp
+++ b/source/web/jsp/dialog/advanced-search.jsp
@@ -51,7 +51,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="advsearch">
+   <h:form acceptcharset="UTF-8" id="advsearch">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/apply-doc-template.jsp b/source/web/jsp/dialog/apply-doc-template.jsp
index ca18d10993..48faf47c18 100644
--- a/source/web/jsp/dialog/apply-doc-template.jsp
+++ b/source/web/jsp/dialog/apply-doc-template.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="apply-template">
+   <h:form acceptcharset="UTF-8" id="apply-template">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/apply-rss-template.jsp b/source/web/jsp/dialog/apply-rss-template.jsp
index 3b59aa2443..78b0dc13ee 100644
--- a/source/web/jsp/dialog/apply-rss-template.jsp
+++ b/source/web/jsp/dialog/apply-rss-template.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="apply-rss">
+   <h:form acceptcharset="UTF-8" id="apply-rss">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/apply-space-template.jsp b/source/web/jsp/dialog/apply-space-template.jsp
index 6c98a79ffa..20aa334dd9 100644
--- a/source/web/jsp/dialog/apply-space-template.jsp
+++ b/source/web/jsp/dialog/apply-space-template.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="apply-template">
+   <h:form acceptcharset="UTF-8" id="apply-template">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/checkin-file.jsp b/source/web/jsp/dialog/checkin-file.jsp
index 54882ba020..4a8424a932 100644
--- a/source/web/jsp/dialog/checkin-file.jsp
+++ b/source/web/jsp/dialog/checkin-file.jsp
@@ -44,7 +44,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="checkin-file1">
+   <h:form acceptcharset="UTF-8" id="checkin-file1">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
@@ -226,7 +226,7 @@
                   <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width="4"></td>
                </tr>
                
-               <h:form acceptCharset="UTF-8" id="checkin-file2">
+               <h:form acceptcharset="UTF-8" id="checkin-file2">
                
                <%-- Error Messages --%>
                <tr valign="top">
diff --git a/source/web/jsp/dialog/checkout-file-link.jsp b/source/web/jsp/dialog/checkout-file-link.jsp
index 37877e49d5..d0aead6e87 100644
--- a/source/web/jsp/dialog/checkout-file-link.jsp
+++ b/source/web/jsp/dialog/checkout-file-link.jsp
@@ -40,7 +40,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="checkout-link">
+   <h:form acceptcharset="UTF-8" id="checkout-link">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/checkout-file.jsp b/source/web/jsp/dialog/checkout-file.jsp
index 46492e6ad6..ed62004c77 100644
--- a/source/web/jsp/dialog/checkout-file.jsp
+++ b/source/web/jsp/dialog/checkout-file.jsp
@@ -40,7 +40,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="checkout-file">
+   <h:form acceptcharset="UTF-8" id="checkout-file">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/container.jsp b/source/web/jsp/dialog/container.jsp
index 07bcbd33f3..8f2db78057 100644
--- a/source/web/jsp/dialog/container.jsp
+++ b/source/web/jsp/dialog/container.jsp
@@ -40,7 +40,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="dialog">
+   <h:form acceptcharset="UTF-8" id="dialog">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/delete-rule.jsp b/source/web/jsp/dialog/delete-rule.jsp
index fc7dff4113..efb14b9828 100644
--- a/source/web/jsp/dialog/delete-rule.jsp
+++ b/source/web/jsp/dialog/delete-rule.jsp
@@ -40,7 +40,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="delete-file">
+   <h:form acceptcharset="UTF-8" id="delete-file">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/document-details.jsp b/source/web/jsp/dialog/document-details.jsp
index 9b8b9a43a3..041be30b68 100644
--- a/source/web/jsp/dialog/document-details.jsp
+++ b/source/web/jsp/dialog/document-details.jsp
@@ -47,7 +47,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="document-details">
+   <h:form acceptcharset="UTF-8" id="document-details">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/edit-category.jsp b/source/web/jsp/dialog/edit-category.jsp
index 1ea562911a..26b9164565 100644
--- a/source/web/jsp/dialog/edit-category.jsp
+++ b/source/web/jsp/dialog/edit-category.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="edit-category">
+   <h:form acceptcharset="UTF-8" id="edit-category">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/edit-file.jsp b/source/web/jsp/dialog/edit-file.jsp
index d2810453c1..af81dae95d 100644
--- a/source/web/jsp/dialog/edit-file.jsp
+++ b/source/web/jsp/dialog/edit-file.jsp
@@ -40,7 +40,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="edit-file">
+   <h:form acceptcharset="UTF-8" id="edit-file">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/edit-html-inline.jsp b/source/web/jsp/dialog/edit-html-inline.jsp
index ab2a27959e..f9d444446e 100644
--- a/source/web/jsp/dialog/edit-html-inline.jsp
+++ b/source/web/jsp/dialog/edit-html-inline.jsp
@@ -66,7 +66,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="edit-file">
+   <h:form acceptcharset="UTF-8" id="edit-file">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/edit-link-properties.jsp b/source/web/jsp/dialog/edit-link-properties.jsp
index 92533b68d7..88f3b900ac 100644
--- a/source/web/jsp/dialog/edit-link-properties.jsp
+++ b/source/web/jsp/dialog/edit-link-properties.jsp
@@ -53,7 +53,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="edit-link-props">
+   <h:form acceptcharset="UTF-8" id="edit-link-props">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/edit-search.jsp b/source/web/jsp/dialog/edit-search.jsp
index 45b9b989f4..0269b1f4d0 100644
--- a/source/web/jsp/dialog/edit-search.jsp
+++ b/source/web/jsp/dialog/edit-search.jsp
@@ -63,7 +63,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="save-search">
+   <h:form acceptcharset="UTF-8" id="save-search">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/edit-simple-workflow.jsp b/source/web/jsp/dialog/edit-simple-workflow.jsp
index 4e5ab8795f..de8cc951dc 100644
--- a/source/web/jsp/dialog/edit-simple-workflow.jsp
+++ b/source/web/jsp/dialog/edit-simple-workflow.jsp
@@ -78,7 +78,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="edit-simple-workflow">
+   <h:form acceptcharset="UTF-8" id="edit-simple-workflow">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/edit-space-category.jsp b/source/web/jsp/dialog/edit-space-category.jsp
index 3439f99580..444316f8e1 100644
--- a/source/web/jsp/dialog/edit-space-category.jsp
+++ b/source/web/jsp/dialog/edit-space-category.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="edit-category">
+   <h:form acceptcharset="UTF-8" id="edit-category">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/edit-space-simple-workflow.jsp b/source/web/jsp/dialog/edit-space-simple-workflow.jsp
index 1664749572..9200d2a3e2 100644
--- a/source/web/jsp/dialog/edit-space-simple-workflow.jsp
+++ b/source/web/jsp/dialog/edit-space-simple-workflow.jsp
@@ -78,7 +78,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="edit-simple-workflow">
+   <h:form acceptcharset="UTF-8" id="edit-simple-workflow">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/edit-text-inline.jsp b/source/web/jsp/dialog/edit-text-inline.jsp
index f943276327..c9879f9dae 100644
--- a/source/web/jsp/dialog/edit-text-inline.jsp
+++ b/source/web/jsp/dialog/edit-text-inline.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="edit-file">
+   <h:form acceptcharset="UTF-8" id="edit-file">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/edit-xml-inline.jsp b/source/web/jsp/dialog/edit-xml-inline.jsp
index 347a4b52ea..0cdbe2f238 100644
--- a/source/web/jsp/dialog/edit-xml-inline.jsp
+++ b/source/web/jsp/dialog/edit-xml-inline.jsp
@@ -74,7 +74,7 @@ final InstanceData instanceData = new InstanceData() {
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="edit-file">
+   <h:form acceptcharset="UTF-8" id="edit-file">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/export.jsp b/source/web/jsp/dialog/export.jsp
index 2e2cd39cb6..e656e12f7b 100644
--- a/source/web/jsp/dialog/export.jsp
+++ b/source/web/jsp/dialog/export.jsp
@@ -62,7 +62,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="export-form">
+   <h:form acceptcharset="UTF-8" id="export-form">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/filelink-details.jsp b/source/web/jsp/dialog/filelink-details.jsp
index 1e5bde8c9e..8c2283f9f3 100644
--- a/source/web/jsp/dialog/filelink-details.jsp
+++ b/source/web/jsp/dialog/filelink-details.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="filelink-details">
+   <h:form acceptcharset="UTF-8" id="filelink-details">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/import.jsp b/source/web/jsp/dialog/import.jsp
index 7fc47c6ce7..819d296b3e 100644
--- a/source/web/jsp/dialog/import.jsp
+++ b/source/web/jsp/dialog/import.jsp
@@ -43,7 +43,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="import-form">
+   <h:form acceptcharset="UTF-8" id="import-form">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
@@ -134,7 +134,7 @@
                                  </tr>
                                  </r:uploadForm>
                                  
-                                 <h:form acceptCharset="UTF-8" id="import-upload-end">
+                                 <h:form acceptcharset="UTF-8" id="import-upload-end">
                                  <tr><td class="paddingRow"></td></tr>
                                  <%
                                  ImportBean bean = (ImportBean)FacesHelper.getManagedBean(FacesContext.getCurrentInstance(), "ImportDialog");
diff --git a/source/web/jsp/dialog/preview-file.jsp b/source/web/jsp/dialog/preview-file.jsp
index edc16667f2..ac00b4c48b 100644
--- a/source/web/jsp/dialog/preview-file.jsp
+++ b/source/web/jsp/dialog/preview-file.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="preview-file">
+   <h:form acceptcharset="UTF-8" id="preview-file">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/preview-space.jsp b/source/web/jsp/dialog/preview-space.jsp
index 50472cc351..11ee22a947 100644
--- a/source/web/jsp/dialog/preview-space.jsp
+++ b/source/web/jsp/dialog/preview-space.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="preview-space">
+   <h:form acceptcharset="UTF-8" id="preview-space">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/rules.jsp b/source/web/jsp/dialog/rules.jsp
index 5232eb4354..5760afc029 100644
--- a/source/web/jsp/dialog/rules.jsp
+++ b/source/web/jsp/dialog/rules.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="document-details">
+   <h:form acceptcharset="UTF-8" id="document-details">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/save-search.jsp b/source/web/jsp/dialog/save-search.jsp
index 7e22166431..817aea5545 100644
--- a/source/web/jsp/dialog/save-search.jsp
+++ b/source/web/jsp/dialog/save-search.jsp
@@ -63,7 +63,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="save-search">
+   <h:form acceptcharset="UTF-8" id="save-search">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/space-details.jsp b/source/web/jsp/dialog/space-details.jsp
index a4cc234a21..f495c315b3 100644
--- a/source/web/jsp/dialog/space-details.jsp
+++ b/source/web/jsp/dialog/space-details.jsp
@@ -47,7 +47,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="space-details">
+   <h:form acceptcharset="UTF-8" id="space-details">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/spacelink-details.jsp b/source/web/jsp/dialog/spacelink-details.jsp
index f28444f1c4..dfd9aa09c2 100644
--- a/source/web/jsp/dialog/spacelink-details.jsp
+++ b/source/web/jsp/dialog/spacelink-details.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="spacelink-details">
+   <h:form acceptcharset="UTF-8" id="spacelink-details">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/system-info.jsp b/source/web/jsp/dialog/system-info.jsp
index df0f71bbcf..ca5ea95cf0 100644
--- a/source/web/jsp/dialog/system-info.jsp
+++ b/source/web/jsp/dialog/system-info.jsp
@@ -40,7 +40,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    <f:loadBundle basename="alfresco.version" var="version"/>
    
-   <h:form acceptCharset="UTF-8" id="system-information-form">
+   <h:form acceptcharset="UTF-8" id="system-information-form">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/undocheckout-file.jsp b/source/web/jsp/dialog/undocheckout-file.jsp
index da4a57d5bc..d8953f2573 100644
--- a/source/web/jsp/dialog/undocheckout-file.jsp
+++ b/source/web/jsp/dialog/undocheckout-file.jsp
@@ -40,7 +40,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="undocheckout-file">
+   <h:form acceptcharset="UTF-8" id="undocheckout-file">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/dialog/update-file.jsp b/source/web/jsp/dialog/update-file.jsp
index f28d700fd0..d6385d7b78 100644
--- a/source/web/jsp/dialog/update-file.jsp
+++ b/source/web/jsp/dialog/update-file.jsp
@@ -44,7 +44,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="update-file1">
+   <h:form acceptcharset="UTF-8" id="update-file1">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
@@ -147,7 +147,7 @@
                                  <% } %>
                                  </r:uploadForm>
                                  
-                                 <h:form acceptCharset="UTF-8" id="update-file2">
+                                 <h:form acceptcharset="UTF-8" id="update-file2">
                               </table>
                               <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
                            </td>
diff --git a/source/web/jsp/dialog/working-copy-missing.jsp b/source/web/jsp/dialog/working-copy-missing.jsp
index fee1ef9bec..dee020ee43 100644
--- a/source/web/jsp/dialog/working-copy-missing.jsp
+++ b/source/web/jsp/dialog/working-copy-missing.jsp
@@ -40,7 +40,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="missing-working-copy">
+   <h:form acceptcharset="UTF-8" id="missing-working-copy">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/forums/forum-details.jsp b/source/web/jsp/forums/forum-details.jsp
index d662c85b75..350182c085 100644
--- a/source/web/jsp/forums/forum-details.jsp
+++ b/source/web/jsp/forums/forum-details.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="forum-details">
+   <h:form acceptcharset="UTF-8" id="forum-details">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/forums/forum.jsp b/source/web/jsp/forums/forum.jsp
index e06a53c4e1..2b24d03989 100644
--- a/source/web/jsp/forums/forum.jsp
+++ b/source/web/jsp/forums/forum.jsp
@@ -38,7 +38,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="browse-topics">
+   <h:form acceptcharset="UTF-8" id="browse-topics">
    
    <%-- Main outer table --%>
    <table cellspacing=0 cellpadding=2>
diff --git a/source/web/jsp/forums/forums-details.jsp b/source/web/jsp/forums/forums-details.jsp
index eec622632a..8e915df926 100644
--- a/source/web/jsp/forums/forums-details.jsp
+++ b/source/web/jsp/forums/forums-details.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="forums-details">
+   <h:form acceptcharset="UTF-8" id="forums-details">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/forums/forums.jsp b/source/web/jsp/forums/forums.jsp
index 5ba2c6221c..fcde877b57 100644
--- a/source/web/jsp/forums/forums.jsp
+++ b/source/web/jsp/forums/forums.jsp
@@ -38,7 +38,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="browse-forums">
+   <h:form acceptcharset="UTF-8" id="browse-forums">
    
    <%-- Main outer table --%>
    <table cellspacing=0 cellpadding=2>
diff --git a/source/web/jsp/forums/topic-details.jsp b/source/web/jsp/forums/topic-details.jsp
index d8df7a9a1c..131bbd044a 100644
--- a/source/web/jsp/forums/topic-details.jsp
+++ b/source/web/jsp/forums/topic-details.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="topic-details">
+   <h:form acceptcharset="UTF-8" id="topic-details">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/forums/topic.jsp b/source/web/jsp/forums/topic.jsp
index 0d757f3b7b..d0e7da5627 100644
--- a/source/web/jsp/forums/topic.jsp
+++ b/source/web/jsp/forums/topic.jsp
@@ -38,7 +38,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="browse-posts">
+   <h:form acceptcharset="UTF-8" id="browse-posts">
    
    <%-- Main outer table --%>
    <table cellspacing=0 cellpadding=2>
diff --git a/source/web/jsp/groups/add-user.jsp b/source/web/jsp/groups/add-user.jsp
index c84fa2be83..c4c04c4a32 100644
--- a/source/web/jsp/groups/add-user.jsp
+++ b/source/web/jsp/groups/add-user.jsp
@@ -38,7 +38,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="add-user-group">
+   <h:form acceptcharset="UTF-8" id="add-user-group">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/groups/delete-group.jsp b/source/web/jsp/groups/delete-group.jsp
index a93060abd9..4b09bd95c6 100644
--- a/source/web/jsp/groups/delete-group.jsp
+++ b/source/web/jsp/groups/delete-group.jsp
@@ -39,7 +39,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="delete-group">
+   <h:form acceptcharset="UTF-8" id="delete-group">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/groups/groups.jsp b/source/web/jsp/groups/groups.jsp
index dce32d9387..fadb251872 100644
--- a/source/web/jsp/groups/groups.jsp
+++ b/source/web/jsp/groups/groups.jsp
@@ -38,7 +38,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="groups">
+   <h:form acceptcharset="UTF-8" id="groups">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/groups/new-group.jsp b/source/web/jsp/groups/new-group.jsp
index e2daee7fd9..03ec249b5f 100644
--- a/source/web/jsp/groups/new-group.jsp
+++ b/source/web/jsp/groups/new-group.jsp
@@ -62,7 +62,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="new-group">
+   <h:form acceptcharset="UTF-8" id="new-group">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/login.jsp b/source/web/jsp/login.jsp
index 50662d71df..8c4c91f04f 100644
--- a/source/web/jsp/login.jsp
+++ b/source/web/jsp/login.jsp
@@ -65,7 +65,7 @@
    <%-- load a bundle of properties I18N strings here --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="loginForm" >
+   <h:form acceptcharset="UTF-8" id="loginForm" >
    
    <table width=100% height=98% align=center>
       <tr width=100% align=center>
diff --git a/source/web/jsp/relogin.jsp b/source/web/jsp/relogin.jsp
index 6c45ac2089..c4406f371e 100644
--- a/source/web/jsp/relogin.jsp
+++ b/source/web/jsp/relogin.jsp
@@ -55,7 +55,7 @@
    <%-- load a bundle of properties I18N strings here --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="loggedOutForm" >
+   <h:form acceptcharset="UTF-8" id="loggedOutForm" >
    
    <table width=100% height=90% align=center>
       <tr width=100% align=center>
diff --git a/source/web/jsp/roles/edit-content-user-roles.jsp b/source/web/jsp/roles/edit-content-user-roles.jsp
index 5c7329591e..e8d08b4b86 100644
--- a/source/web/jsp/roles/edit-content-user-roles.jsp
+++ b/source/web/jsp/roles/edit-content-user-roles.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="invite-users">
+   <h:form acceptcharset="UTF-8" id="invite-users">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/roles/edit-user-roles.jsp b/source/web/jsp/roles/edit-user-roles.jsp
index ff556366e6..2b08853d6c 100644
--- a/source/web/jsp/roles/edit-user-roles.jsp
+++ b/source/web/jsp/roles/edit-user-roles.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="invite-users">
+   <h:form acceptcharset="UTF-8" id="invite-users">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/roles/manage-content-users.jsp b/source/web/jsp/roles/manage-content-users.jsp
index 09e821da0b..3b5bf7c583 100644
--- a/source/web/jsp/roles/manage-content-users.jsp
+++ b/source/web/jsp/roles/manage-content-users.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="users">
+   <h:form acceptcharset="UTF-8" id="users">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/roles/manage-invited-users.jsp b/source/web/jsp/roles/manage-invited-users.jsp
index ef40d1d824..b67409a794 100644
--- a/source/web/jsp/roles/manage-invited-users.jsp
+++ b/source/web/jsp/roles/manage-invited-users.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="users">
+   <h:form acceptcharset="UTF-8" id="users">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/roles/remove-content-user.jsp b/source/web/jsp/roles/remove-content-user.jsp
index b276dc3d76..299ba40e71 100644
--- a/source/web/jsp/roles/remove-content-user.jsp
+++ b/source/web/jsp/roles/remove-content-user.jsp
@@ -40,7 +40,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="remove-user">
+   <h:form acceptcharset="UTF-8" id="remove-user">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/roles/remove-invited-user.jsp b/source/web/jsp/roles/remove-invited-user.jsp
index 7cb1614ea3..09dfeb0236 100644
--- a/source/web/jsp/roles/remove-invited-user.jsp
+++ b/source/web/jsp/roles/remove-invited-user.jsp
@@ -40,7 +40,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="remove-user">
+   <h:form acceptcharset="UTF-8" id="remove-user">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/rules/compare-mime-type.jsp b/source/web/jsp/rules/compare-mime-type.jsp
index 954f462620..d2a812303d 100644
--- a/source/web/jsp/rules/compare-mime-type.jsp
+++ b/source/web/jsp/rules/compare-mime-type.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="has-mimetype-condition">
+   <h:form acceptcharset="UTF-8" id="has-mimetype-condition">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/rules/compare-property-value.jsp b/source/web/jsp/rules/compare-property-value.jsp
index 2ff447506a..4a0353751e 100644
--- a/source/web/jsp/rules/compare-property-value.jsp
+++ b/source/web/jsp/rules/compare-property-value.jsp
@@ -47,7 +47,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="contains-text-condition">
+   <h:form acceptcharset="UTF-8" id="contains-text-condition">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/rules/has-aspect.jsp b/source/web/jsp/rules/has-aspect.jsp
index a07e8cd6be..d0cde97667 100644
--- a/source/web/jsp/rules/has-aspect.jsp
+++ b/source/web/jsp/rules/has-aspect.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="has-aspect-condition">
+   <h:form acceptcharset="UTF-8" id="has-aspect-condition">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/rules/in-category.jsp b/source/web/jsp/rules/in-category.jsp
index 54bb8f5ae1..80c4d0d547 100644
--- a/source/web/jsp/rules/in-category.jsp
+++ b/source/web/jsp/rules/in-category.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="in-category-condition">
+   <h:form acceptcharset="UTF-8" id="in-category-condition">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/rules/is-subtype.jsp b/source/web/jsp/rules/is-subtype.jsp
index f4f6a74fcd..d3bfabb016 100644
--- a/source/web/jsp/rules/is-subtype.jsp
+++ b/source/web/jsp/rules/is-subtype.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="is-subtype-condition">
+   <h:form acceptcharset="UTF-8" id="is-subtype-condition">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/trashcan/delete-all.jsp b/source/web/jsp/trashcan/delete-all.jsp
index 8f8adec0bf..966d6abd6e 100644
--- a/source/web/jsp/trashcan/delete-all.jsp
+++ b/source/web/jsp/trashcan/delete-all.jsp
@@ -40,7 +40,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="delete-all">
+   <h:form acceptcharset="UTF-8" id="delete-all">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/trashcan/delete-item.jsp b/source/web/jsp/trashcan/delete-item.jsp
index 0836a27ebd..82fa01f1e0 100644
--- a/source/web/jsp/trashcan/delete-item.jsp
+++ b/source/web/jsp/trashcan/delete-item.jsp
@@ -40,7 +40,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="delete-item">
+   <h:form acceptcharset="UTF-8" id="delete-item">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/trashcan/delete-listed.jsp b/source/web/jsp/trashcan/delete-listed.jsp
index de68d0b196..c5695a5e09 100644
--- a/source/web/jsp/trashcan/delete-listed.jsp
+++ b/source/web/jsp/trashcan/delete-listed.jsp
@@ -40,7 +40,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="delete-listed">
+   <h:form acceptcharset="UTF-8" id="delete-listed">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/trashcan/item-details.jsp b/source/web/jsp/trashcan/item-details.jsp
index daf48e0b18..5bb0081724 100644
--- a/source/web/jsp/trashcan/item-details.jsp
+++ b/source/web/jsp/trashcan/item-details.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="deleteditem-details">
+   <h:form acceptcharset="UTF-8" id="deleteditem-details">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/trashcan/recover-all.jsp b/source/web/jsp/trashcan/recover-all.jsp
index 1b5f89ea6a..9c75562755 100644
--- a/source/web/jsp/trashcan/recover-all.jsp
+++ b/source/web/jsp/trashcan/recover-all.jsp
@@ -40,7 +40,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="recover-all">
+   <h:form acceptcharset="UTF-8" id="recover-all">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/trashcan/recover-item.jsp b/source/web/jsp/trashcan/recover-item.jsp
index c6acb9899d..89b71d1c22 100644
--- a/source/web/jsp/trashcan/recover-item.jsp
+++ b/source/web/jsp/trashcan/recover-item.jsp
@@ -40,7 +40,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="recover-item">
+   <h:form acceptcharset="UTF-8" id="recover-item">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/trashcan/recover-listed.jsp b/source/web/jsp/trashcan/recover-listed.jsp
index 7da29b6a7b..8f99f55745 100644
--- a/source/web/jsp/trashcan/recover-listed.jsp
+++ b/source/web/jsp/trashcan/recover-listed.jsp
@@ -40,7 +40,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="recover-listed">
+   <h:form acceptcharset="UTF-8" id="recover-listed">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/trashcan/recovery-report.jsp b/source/web/jsp/trashcan/recovery-report.jsp
index f54bf179be..64b658335d 100644
--- a/source/web/jsp/trashcan/recovery-report.jsp
+++ b/source/web/jsp/trashcan/recovery-report.jsp
@@ -40,7 +40,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="recovery-report">
+   <h:form acceptcharset="UTF-8" id="recovery-report">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/trashcan/trash-list.jsp b/source/web/jsp/trashcan/trash-list.jsp
index b88f29ce12..1168f35e78 100644
--- a/source/web/jsp/trashcan/trash-list.jsp
+++ b/source/web/jsp/trashcan/trash-list.jsp
@@ -78,7 +78,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="trashcan">
+   <h:form acceptcharset="UTF-8" id="trashcan">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/users/change-my-password.jsp b/source/web/jsp/users/change-my-password.jsp
index 1e399bb09a..e39920919d 100644
--- a/source/web/jsp/users/change-my-password.jsp
+++ b/source/web/jsp/users/change-my-password.jsp
@@ -65,7 +65,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="edit-my-pass">
+   <h:form acceptcharset="UTF-8" id="edit-my-pass">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/users/change-password.jsp b/source/web/jsp/users/change-password.jsp
index 49fbccec52..119ef50c7c 100644
--- a/source/web/jsp/users/change-password.jsp
+++ b/source/web/jsp/users/change-password.jsp
@@ -64,7 +64,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="edit-pass">
+   <h:form acceptcharset="UTF-8" id="edit-pass">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/users/delete-user.jsp b/source/web/jsp/users/delete-user.jsp
index 1a4d29cb2a..76afabaac0 100644
--- a/source/web/jsp/users/delete-user.jsp
+++ b/source/web/jsp/users/delete-user.jsp
@@ -40,7 +40,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="delete-user">
+   <h:form acceptcharset="UTF-8" id="delete-user">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/users/edit-user-details.jsp b/source/web/jsp/users/edit-user-details.jsp
index 3f03fe128f..e63f93cd4d 100644
--- a/source/web/jsp/users/edit-user-details.jsp
+++ b/source/web/jsp/users/edit-user-details.jsp
@@ -65,7 +65,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="edit-user">
+   <h:form acceptcharset="UTF-8" id="edit-user">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/users/user-console.jsp b/source/web/jsp/users/user-console.jsp
index b36b587def..6236385248 100644
--- a/source/web/jsp/users/user-console.jsp
+++ b/source/web/jsp/users/user-console.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="user-console">
+   <h:form acceptcharset="UTF-8" id="user-console">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/users/users.jsp b/source/web/jsp/users/users.jsp
index 91b78a472e..86e28d49c8 100644
--- a/source/web/jsp/users/users.jsp
+++ b/source/web/jsp/users/users.jsp
@@ -62,7 +62,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="users">
+   <h:form acceptcharset="UTF-8" id="users">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/wcm/add-content-dialog.jsp b/source/web/jsp/wcm/add-content-dialog.jsp
index a369d26c74..4db2f2018e 100644
--- a/source/web/jsp/wcm/add-content-dialog.jsp
+++ b/source/web/jsp/wcm/add-content-dialog.jsp
@@ -54,7 +54,7 @@ if (dialog != null && dialog.getFileName() != null)
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="add-content-upload-start">
+   <h:form acceptcharset="UTF-8" id="add-content-upload-start">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
@@ -169,7 +169,7 @@ if (dialog != null && dialog.getFileName() != null)
                                  </r:uploadForm>
                                  <% } %>
                                  
-                                 <h:form acceptCharset="UTF-8" id="add-content-upload-end" onsubmit="return validate();">
+                                 <h:form acceptcharset="UTF-8" id="add-content-upload-end" onsubmit="return validate();">
                                  <% if (fileUploaded) { %>
                                  <tr>
                                     <td colspan="3">
diff --git a/source/web/jsp/wcm/browse-sandbox.jsp b/source/web/jsp/wcm/browse-sandbox.jsp
index e1a54ee088..485ec50197 100644
--- a/source/web/jsp/wcm/browse-sandbox.jsp
+++ b/source/web/jsp/wcm/browse-sandbox.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="browse-sandbox">
+   <h:form acceptcharset="UTF-8" id="browse-sandbox">
    
    <%-- Main outer table --%>
    <table cellspacing=0 cellpadding=2>
diff --git a/source/web/jsp/wcm/browse-website.jsp b/source/web/jsp/wcm/browse-website.jsp
index 6b75407045..4c4b8dfe90 100644
--- a/source/web/jsp/wcm/browse-website.jsp
+++ b/source/web/jsp/wcm/browse-website.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="website">
+   <h:form acceptcharset="UTF-8" id="website">
    
    <%-- Main outer table --%>
    <table cellspacing=0 cellpadding=2>
diff --git a/source/web/jsp/wcm/edit-file.jsp b/source/web/jsp/wcm/edit-file.jsp
index dff4d8bb9d..3573d77abf 100644
--- a/source/web/jsp/wcm/edit-file.jsp
+++ b/source/web/jsp/wcm/edit-file.jsp
@@ -40,7 +40,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="edit-file">
+   <h:form acceptcharset="UTF-8" id="edit-file">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/wcm/edit-xml-inline.jsp b/source/web/jsp/wcm/edit-xml-inline.jsp
index ffbbf8f39c..0373f0b134 100644
--- a/source/web/jsp/wcm/edit-xml-inline.jsp
+++ b/source/web/jsp/wcm/edit-xml-inline.jsp
@@ -51,7 +51,7 @@ function _xforms_getSaveDraftButtons()
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="edit-file">
+   <h:form acceptcharset="UTF-8" id="edit-file">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/wcm/file-details.jsp b/source/web/jsp/wcm/file-details.jsp
index ef4b1d7e2c..7d25607c4b 100644
--- a/source/web/jsp/wcm/file-details.jsp
+++ b/source/web/jsp/wcm/file-details.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="file-details">
+   <h:form acceptcharset="UTF-8" id="file-details">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/wcm/folder-details.jsp b/source/web/jsp/wcm/folder-details.jsp
index 8eb18b94b3..db41da6366 100644
--- a/source/web/jsp/wcm/folder-details.jsp
+++ b/source/web/jsp/wcm/folder-details.jsp
@@ -38,7 +38,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="folder-details">
+   <h:form acceptcharset="UTF-8" id="folder-details">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/wcm/import-content-dialog.jsp b/source/web/jsp/wcm/import-content-dialog.jsp
index 7c3ee15127..8504313398 100644
--- a/source/web/jsp/wcm/import-content-dialog.jsp
+++ b/source/web/jsp/wcm/import-content-dialog.jsp
@@ -43,7 +43,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="add-content-upload-start">
+   <h:form acceptcharset="UTF-8" id="add-content-upload-start">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
@@ -149,7 +149,7 @@
                                  </r:uploadForm>
                                  <% } %>
                                  
-                                 <h:form acceptCharset="UTF-8" id="add-content-upload-end">
+                                 <h:form acceptcharset="UTF-8" id="add-content-upload-end">
                                  <% if (foundFile) { %>
                                  <tr>
                                     <td>
diff --git a/source/web/jsp/wcm/update-file.jsp b/source/web/jsp/wcm/update-file.jsp
index 6ade38d9bd..9146264661 100644
--- a/source/web/jsp/wcm/update-file.jsp
+++ b/source/web/jsp/wcm/update-file.jsp
@@ -43,7 +43,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="update-file1">
+   <h:form acceptcharset="UTF-8" id="update-file1">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
@@ -146,7 +146,7 @@
                                  <% } %>
                                  </r:uploadForm>
                                  
-                                 <h:form acceptCharset="UTF-8" id="update-file2">
+                                 <h:form acceptcharset="UTF-8" id="update-file2">
                               </table>
                               <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %>
                            </td>
diff --git a/source/web/jsp/wcm/website-details.jsp b/source/web/jsp/wcm/website-details.jsp
index 1c7e1ac425..a055bab809 100644
--- a/source/web/jsp/wcm/website-details.jsp
+++ b/source/web/jsp/wcm/website-details.jsp
@@ -39,7 +39,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="website-details">
+   <h:form acceptcharset="UTF-8" id="website-details">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/wizard/container.jsp b/source/web/jsp/wizard/container.jsp
index 79745adc4e..0f7fc3e12c 100644
--- a/source/web/jsp/wizard/container.jsp
+++ b/source/web/jsp/wizard/container.jsp
@@ -40,7 +40,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
 
-   <h:form acceptCharset="UTF-8" id="wizard">
+   <h:form acceptcharset="UTF-8" id="wizard">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/wizard/new-user/person-properties.jsp b/source/web/jsp/wizard/new-user/person-properties.jsp
index c8e7c91fd6..fc98806fc0 100644
--- a/source/web/jsp/wizard/new-user/person-properties.jsp
+++ b/source/web/jsp/wizard/new-user/person-properties.jsp
@@ -65,7 +65,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="person-props">
+   <h:form acceptcharset="UTF-8" id="person-props">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/wizard/new-user/summary.jsp b/source/web/jsp/wizard/new-user/summary.jsp
index fd1d25915f..97a44d13bb 100644
--- a/source/web/jsp/wizard/new-user/summary.jsp
+++ b/source/web/jsp/wizard/new-user/summary.jsp
@@ -40,7 +40,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="person-props">
+   <h:form acceptcharset="UTF-8" id="person-props">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">
diff --git a/source/web/jsp/wizard/new-user/user-properties.jsp b/source/web/jsp/wizard/new-user/user-properties.jsp
index e4f0f13cb8..3e44482aa9 100644
--- a/source/web/jsp/wizard/new-user/user-properties.jsp
+++ b/source/web/jsp/wizard/new-user/user-properties.jsp
@@ -84,7 +84,7 @@
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
    <%-- set the form name here --%>
-   <h:form acceptCharset="UTF-8" id="user-props">
+   <h:form acceptcharset="UTF-8" id="user-props">
    
    <%-- Main outer table --%>
    <table cellspacing="0" cellpadding="2">