diff --git a/config/alfresco/web-client-config-workflow.xml b/config/alfresco/web-client-config-workflow.xml
index a654a00cd2..43538372a4 100644
--- a/config/alfresco/web-client-config-workflow.xml
+++ b/config/alfresco/web-client-config-workflow.xml
@@ -4,22 +4,24 @@
    <!-- Properties -->
    <!--            -->
    
+   <!-- Generic workflow task -->
+   
    <config evaluator="node-type" condition="bpm:workflowTask">
       <property-sheet>
          <separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
          <show-property name="bpm:taskId" ignore-if-missing="false" />
-         <show-property name="bpm:startDate" ignore-if-missing="false" />
          <show-property name="bpm:status" ignore-if-missing="false" />
          <show-property name="bpm:dueDate" ignore-if-missing="false" />
          <show-property name="bpm:priority" ignore-if-missing="false" />
       </property-sheet>
    </config>
    
+   <!-- Review and Approve workflow tasks -->
+   
    <config evaluator="node-type" condition="wf:reviewTask">
       <property-sheet>
          <separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
          <show-property name="bpm:taskId" ignore-if-missing="false" />
-         <show-property name="bpm:startDate" ignore-if-missing="false" />
          <show-property name="bpm:status" ignore-if-missing="false" />
          <show-property name="bpm:dueDate" ignore-if-missing="false" />
          <show-property name="bpm:priority" ignore-if-missing="false" />
@@ -36,6 +38,41 @@
       </property-sheet>
    </config>
    
+   <!-- Ad hoc workflow tasks -->
+
+   <config evaluator="node-type" condition="wf:submitAdhocTask">
+      <property-sheet>
+         <separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
+         <show-property name="wf:adhocDescription" ignore-if-missing="false" />
+         <show-property name="wf:adhocPriority" ignore-if-missing="false" />
+         <show-property name="wf:adhocDueDate" ignore-if-missing="false" />
+         <show-property name="wf:notifyMe" />
+         <separator name="sep2" display-label-id="users_and_roles" component-generator="HeaderSeparatorGenerator" />
+         <show-association name="wf:assignee" ignore-if-missing="false" />
+      </property-sheet>
+   </config>
+   
+   <config evaluator="node-type" condition="wf:adhocTask">
+      <property-sheet>
+         <separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
+         <show-property name="bpm:taskId" ignore-if-missing="false" />
+         <show-property name="wf:adhocDescription" ignore-if-missing="false" />
+         <show-property name="bpm:status" ignore-if-missing="false" />
+         <show-property name="bpm:dueDate" ignore-if-missing="false" />
+         <show-property name="bpm:priority" ignore-if-missing="false" />
+      </property-sheet>
+   </config>
+   
+   <config evaluator="node-type" condition="wf:completedAdhocTask">
+      <property-sheet>
+         <separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
+         <show-property name="bpm:taskId" ignore-if-missing="false" />
+         <show-property name="wf:adhocDescription" ignore-if-missing="false" />
+         <show-property name="bpm:dueDate" ignore-if-missing="false" />
+         <show-property name="bpm:priority" ignore-if-missing="false" />
+      </property-sheet>
+   </config>
+   
    <!--         -->
    <!-- Actions -->
    <!--         -->
@@ -117,7 +154,6 @@
             <action idref="details_doc" />
             <action idref="checkout_doc" />
             <action idref="cancelcheckout_doc" />
-            <action idref="remove_package_item" />
          </action-group>
          
          <action-group id="workflow_collection_actions">
diff --git a/source/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java b/source/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java
index c1963f2703..77ea5d21e4 100644
--- a/source/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java
+++ b/source/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java
@@ -293,7 +293,12 @@ public class StartWorkflowWizard extends BaseWizardBean
          List<WorkflowDefinition> workflowDefs =  this.workflowService.getDefinitions();
          for (WorkflowDefinition workflowDef : workflowDefs)
          {
-            this.availableWorkflows.add(new SelectItem(workflowDef.id, workflowDef.title));
+            String label = workflowDef.title;
+            if (workflowDef.description != null && workflowDef.description.length() > 0)
+            {
+               label = label + " (" + workflowDef.description + ")";
+            }
+            this.availableWorkflows.add(new SelectItem(workflowDef.id, label));
             this.workflows.put(workflowDef.id, workflowDef);
          }