diff --git a/source/java/org/alfresco/web/bean/wcm/CreateFormWizard.java b/source/java/org/alfresco/web/bean/wcm/CreateFormWizard.java
index 6f18fb00cb..c49c41352b 100644
--- a/source/java/org/alfresco/web/bean/wcm/CreateFormWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/CreateFormWizard.java
@@ -212,7 +212,7 @@ public class CreateFormWizard extends BaseWizardBean
           StringBuilder attribute = new StringBuilder(255);
           attribute.append(DescriptionAttributeHelper.getTableBegin());
           attribute.append(DescriptionAttributeHelper.getTableLine(fc, "description", 
-                   DescriptionAttributeHelper.getDescriptionNotEmpty(fc, this.getDescription())));
+                   DescriptionAttributeHelper.getDescriptionNotEmpty(fc, this.getDescription()), false));
           attribute.append(DescriptionAttributeHelper.getTableLine(fc, "rendering_engine_type", 
                    this.getRenderingEngine().getName()));
           attribute.append(DescriptionAttributeHelper.getTableLine(fc, "output_path_pattern", 
@@ -1363,7 +1363,7 @@ public class CreateFormWizard extends BaseWizardBean
        StringBuilder attribute = new StringBuilder(255);
        attribute.append(DescriptionAttributeHelper.getTableBegin());
        attribute.append(DescriptionAttributeHelper.getTableLine(fc, "description", 
-                DescriptionAttributeHelper.getDescriptionNotEmpty(fc, getFormDescription())));
+                DescriptionAttributeHelper.getDescriptionNotEmpty(fc, getFormDescription()), false));
        attribute.append(DescriptionAttributeHelper.getTableLine(fc, "schema_root_element_name", 
                 getSchemaRootElementName()));
        attribute.append(DescriptionAttributeHelper.getTableLine(fc, "output_path_pattern", 
@@ -1390,7 +1390,7 @@ public class CreateFormWizard extends BaseWizardBean
        }
        
        attribute.append(DescriptionAttributeHelper.getTableLine(fc, "description", 
-                DescriptionAttributeHelper.getDescriptionNotEmpty(fc, desc)));
+                DescriptionAttributeHelper.getDescriptionNotEmpty(fc, desc), false));
        attribute.append(DescriptionAttributeHelper.getTableEnd());
        return attribute.toString();
    }
diff --git a/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java b/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
index c4cf8a5cba..1a2cd97df2 100644
--- a/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
@@ -1386,7 +1386,7 @@ public class CreateWebsiteWizard extends BaseWizardBean
        attribute.append(DescriptionAttributeHelper.getTableLine(fc, "website_webapp", getWebapp()));
        attribute.append(DescriptionAttributeHelper.getTableLine(fc, "title", getTitle()));
        attribute.append(DescriptionAttributeHelper.getTableLine(fc, "description", 
-                DescriptionAttributeHelper.getDescriptionNotEmpty(fc, getDescription())));
+                DescriptionAttributeHelper.getDescriptionNotEmpty(fc, getDescription()), false));
        attribute.append(DescriptionAttributeHelper.getTableEnd());
        return attribute.toString();
    }
@@ -1571,7 +1571,7 @@ public class CreateWebsiteWizard extends BaseWizardBean
           attribute.append(DescriptionAttributeHelper.getTableLine(fc, "name", this.getName()));
           attribute.append(DescriptionAttributeHelper.getTableLine(fc, "title", this.getTitle()));
           attribute.append(DescriptionAttributeHelper.getTableLine(fc, "output_path_pattern", this.getOutputPathPattern()));
-          attribute.append(DescriptionAttributeHelper.getTableLine(fc, "description", formDescription));
+          attribute.append(DescriptionAttributeHelper.getTableLine(fc, "description", formDescription, false));
           attribute.append(DescriptionAttributeHelper.getTableLine(fc, "workflow", workflowTitle));
           attribute.append(DescriptionAttributeHelper.getTableEnd());
           return attribute.toString();
@@ -1786,7 +1786,7 @@ public class CreateWebsiteWizard extends BaseWizardBean
           String workflowDescription = DescriptionAttributeHelper.getDescriptionNotEmpty(fc, getDescription());
           StringBuilder attribute = new StringBuilder(255);
           attribute.append(DescriptionAttributeHelper.getTableBegin());
-          attribute.append(DescriptionAttributeHelper.getTableLine(fc, "description", workflowDescription));
+          attribute.append(DescriptionAttributeHelper.getTableLine(fc, "description", workflowDescription, false));
           attribute.append(DescriptionAttributeHelper.getTableLine(fc, "website_filename_pattern", this.getFilenamePattern()));
           attribute.append(DescriptionAttributeHelper.getTableEnd());
           return attribute.toString();
diff --git a/source/java/org/alfresco/web/bean/wcm/DescriptionAttributeHelper.java b/source/java/org/alfresco/web/bean/wcm/DescriptionAttributeHelper.java
index 1f4ce84033..b603e39adc 100644
--- a/source/java/org/alfresco/web/bean/wcm/DescriptionAttributeHelper.java
+++ b/source/java/org/alfresco/web/bean/wcm/DescriptionAttributeHelper.java
@@ -34,6 +34,7 @@ public class DescriptionAttributeHelper
     {
         return TABLE_BEGIN;
     }
+    
     /**
      * 
      * @param fc            Current FacesContext
@@ -42,10 +43,31 @@ public class DescriptionAttributeHelper
      * @return              Returns a table line <code><tr><td>Localised field name:</td><td>Field value</td></tr></code>
      */
     public static String getTableLine(FacesContext fc, String fieldName, String fieldValue)
+    {
+        return getTableLine(fc, fieldName, fieldValue, true);
+    }
+    
+    /**
+     * 
+     * @param fc            Current FacesContext
+     * @param fieldName     Field name
+     * @param fieldValue    Field value
+     * @param encode        Whether to encode the given value or not
+     * @return              Returns a table line <code><tr><td>Localised field name:</td><td>Field value</td></tr></code>
+     */
+    public static String getTableLine(FacesContext fc, String fieldName, String fieldValue, boolean encode)
     {
         StringBuilder line = new StringBuilder(128);
-        line.append(TRTD_BEGIN).append(Application.getMessage(fc, fieldName)).
-           append(TD_TD).append(Utils.encode(fieldValue)).append(TDTR_END);
+        line.append(TRTD_BEGIN).append(Application.getMessage(fc, fieldName)).append(TD_TD);
+        if (encode)
+        {
+           line.append(Utils.encode(fieldValue));
+        }
+        else
+        {
+           line.append(fieldValue);
+        }
+        line.append(TDTR_END);
         return line.toString();
     }
     
@@ -68,7 +90,7 @@ public class DescriptionAttributeHelper
     {
         return StringUtils.isEmpty(fieldValue) ?
                 SPAN_ITALIC_BEGIN + Application.getMessage(fc, "description_not_set") + SPAN_END :
-                fieldValue;
+                Utils.encode(fieldValue);
     }
 
 }