diff --git a/config/alfresco/web-client-config-workflow-actions.xml b/config/alfresco/web-client-config-workflow-actions.xml
index 249b9edbe2..c83112526b 100644
--- a/config/alfresco/web-client-config-workflow-actions.xml
+++ b/config/alfresco/web-client-config-workflow-actions.xml
@@ -200,6 +200,16 @@
             <action idref="remove_package_item" />
          </action-group>
          
+         <action-group id="start_package_item_actions">
+            <action idref="view_content_properties" />
+            <action idref="edit_content_properties" />
+            <action idref="edit_doc_http" />
+            <action idref="edit_doc_webdav" />
+            <action idref="edit_doc_cifs" />
+            <action idref="update_doc" />
+            <action idref="remove_package_item" />
+         </action-group>
+         
          <action-group id="edit_and_remove_package_item_actions">
             <action idref="view_content_properties" />
             <action idref="edit_content_properties" />
diff --git a/source/java/org/alfresco/web/bean/CheckinCheckoutBean.java b/source/java/org/alfresco/web/bean/CheckinCheckoutBean.java
index dd32c7f540..b07deb529f 100644
--- a/source/java/org/alfresco/web/bean/CheckinCheckoutBean.java
+++ b/source/java/org/alfresco/web/bean/CheckinCheckoutBean.java
@@ -484,7 +484,8 @@ public class CheckinCheckoutBean
                // if this is a workflow action and there is a task id present we need
                // to also link the working copy to the workflow package so it appears
                // in the resources panel in the manage task dialog
-               if (this.isWorkflowAction && this.workflowTaskId != null)
+               if (this.isWorkflowAction && this.workflowTaskId != null && 
+                   (this.workflowTaskId.equals("null") == false))
                {
                   WorkflowTask task = this.workflowService.getTaskById(this.workflowTaskId);
                   if (task != null)
diff --git a/source/web/jsp/workflow/manage-task-dialog.jsp b/source/web/jsp/workflow/manage-task-dialog.jsp
index d8b1def23b..d74f6a8964 100644
--- a/source/web/jsp/workflow/manage-task-dialog.jsp
+++ b/source/web/jsp/workflow/manage-task-dialog.jsp
@@ -38,7 +38,7 @@
                        var="taskProps" columns="1" externalConfig="true" />
 </a:panel>
 
-<h:outputText id="padding1" styleClass="paddingRow" value="&nbsp;" escape="false" />
+<h:outputText id="padding2" styleClass="paddingRow" value="&nbsp;" escape="false" />
 
 <a:panel id="resources-panel" label="#{msg.resources}"
          border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle">
@@ -129,7 +129,7 @@
 
 </a:panel>
 
-<h:outputText id="padding2" styleClass="paddingRow" value="&nbsp;" escape="false" />
+<h:outputText id="padding3" styleClass="paddingRow" value="&nbsp;" escape="false" />
 
 <a:panel id="workflow-summary-panel" label="#{msg.part_of_workflow}"
          border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle">
@@ -138,7 +138,7 @@
 
 </a:panel>
 
-<h:outputText id="padding2" styleClass="paddingRow" value="&nbsp;" escape="false" />
+<h:outputText id="padding4" styleClass="paddingRow" value="&nbsp;" escape="false" />
 
 <a:panel rendered="false" id="workflow-outline" label="#{msg.workflow_outline}" progressive="true" expanded="false" 
          border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle">