diff --git a/config/alfresco/web-client-config-dialogs.xml b/config/alfresco/web-client-config-dialogs.xml
index 6720d6ad58..367db22546 100644
--- a/config/alfresco/web-client-config-dialogs.xml
+++ b/config/alfresco/web-client-config-dialogs.xml
@@ -430,11 +430,11 @@
                  icon="/images/icons/preview_large.gif" title-id="apply_template"
                  description-id="apply_dashboard_info"  /> 
          
-         <dialog name="editSimpleWorkflow" page="/jsp/content/edit-simple-workflow.jsp" managed-bean="EditSimpleWorkflowDialog"
+         <dialog name="editContentSimpleWorkflow" page="/jsp/content/edit-simple-workflow.jsp" managed-bean="EditContentSimpleWorkflowDialog"
                  icon="/images/icons/edit_large.gif" title-id="modify_workflow_props"
                  description-id="editworkflow_description"  /> 
          
-         <dialog name="editSpaceSimpleWorkflow" page="/jsp/spaces/edit-simple-workflow.jsp" managed-bean="EditSimpleWorkflowDialog"
+         <dialog name="editSpaceSimpleWorkflow" page="/jsp/spaces/edit-simple-workflow.jsp" managed-bean="EditSpaceSimpleWorkflowDialog"
                  icon="/images/icons/edit_large.gif" title-id="modify_workflow_props"
                  description-id="editworkflow_description"  /> 
          
diff --git a/source/web/WEB-INF/faces-config-beans.xml b/source/web/WEB-INF/faces-config-beans.xml
index 7297d7e65c..05c7fbb8f8 100644
--- a/source/web/WEB-INF/faces-config-beans.xml
+++ b/source/web/WEB-INF/faces-config-beans.xml
@@ -5018,8 +5018,8 @@
    </managed-bean>
 
    <managed-bean>
-      <description>The bean for Edit Simple Workflow Screen.</description>
-      <managed-bean-name>EditSimpleWorkflowDialog</managed-bean-name>
+      <description>The bean for content Edit Simple Workflow Screen.</description>
+      <managed-bean-name>EditContentSimpleWorkflowDialog</managed-bean-name>
       <managed-bean-class>
          org.alfresco.web.bean.content.EditSimpleWorkflowDialog
       </managed-bean-class>
@@ -5035,8 +5035,8 @@
    </managed-bean>
 
    <managed-bean>
-      <description>The bean for Edit Simple Space Workflow Screen.</description>
-      <managed-bean-name>EditSimpleWorkflowDialog</managed-bean-name>
+      <description>The bean for space Edit Simple Space Workflow Screen.</description>
+      <managed-bean-name>EditSpaceSimpleWorkflowDialog</managed-bean-name>
       <managed-bean-class>
          org.alfresco.web.bean.spaces.EditSimpleWorkflowDialog
       </managed-bean-class>
diff --git a/source/web/jsp/content/document-details.jsp b/source/web/jsp/content/document-details.jsp
index 43547c2f83..2b2af6df14 100644
--- a/source/web/jsp/content/document-details.jsp
+++ b/source/web/jsp/content/document-details.jsp
@@ -266,13 +266,13 @@
 <h:panelGroup id="workflow-panel-facets">
    <f:facet name="title">
       <r:permissionEvaluator value="#{DialogManager.bean.document}" allow="Write">
-         <a:actionLink id="titleLink2" value="#{msg.title_edit_simple_workflow}" showLink="false" image="/images/icons/Change_details.gif" action="dialog:editSimpleWorkflow" rendered="#{DialogManager.bean.approveStepName != null}" />
+         <a:actionLink id="titleLink2" value="#{msg.title_edit_simple_workflow}" showLink="false" image="/images/icons/Change_details.gif" action="dialog:editContentSimpleWorkflow" rendered="#{DialogManager.bean.approveStepName != null}" />
       </r:permissionEvaluator>
    </f:facet>
 </h:panelGroup>
 <a:panel label="#{msg.workflows}" id="workflow-panel" facetsId="dialog:dialog-body:workflow-panel-facets" progressive="true" border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white"
    expanded='#{DialogManager.bean.panels["workflow-panel"]}' expandedActionListener="#{DialogManager.bean.expandPanel}">
-   <r:nodeWorkflowInfo id="workflow-info" value="#{EditSimpleWorkflowDialog.document}" />
+   <r:nodeWorkflowInfo id="workflow-info" value="#{DialogManager.bean.document}" />
 </a:panel>
 
 <f:verbatim>
diff --git a/source/web/jsp/content/edit-simple-workflow.jsp b/source/web/jsp/content/edit-simple-workflow.jsp
index 5a4160f7b1..90198bb87b 100644
--- a/source/web/jsp/content/edit-simple-workflow.jsp
+++ b/source/web/jsp/content/edit-simple-workflow.jsp
@@ -76,7 +76,7 @@
    <tr>
    	<td><nobr></f:verbatim><h:outputText value="#{msg.name_approve_step}" /><f:verbatim>:</nobr></td>
    	<td width="90%"></f:verbatim><h:inputText id="approve-step-name"
-   		value="#{EditSimpleWorkflowDialog.workflowProperties.approveStepName}"
+   		value="#{DialogManager.bean.workflowProperties.approveStepName}"
    		onkeyup="javascript:checkButtonState();" /><f:verbatim></td>
    </tr>
    <tr>
@@ -90,7 +90,7 @@
    	<table cellpadding="2" cellspacing="2" border="0">
    		<tr>
    			<td valign="top"></f:verbatim><h:selectOneRadio
-   				value="#{EditSimpleWorkflowDialog.workflowProperties.approveAction}">
+   				value="#{DialogManager.bean.workflowProperties.approveAction}">
    				<f:selectItem itemValue="move" itemLabel="Move" />
    				<f:selectItem itemValue="copy" itemLabel="Copy" />
    			</h:selectOneRadio><f:verbatim></td>
@@ -101,7 +101,7 @@
    			<td style="padding-top:6px;"></f:verbatim><r:ajaxFolderSelector
    			      id="clientApproveFolder"
    			      label="#{msg.select_destination_prompt}" 
-                  value="#{EditSimpleWorkflowDialog.workflowProperties.approveFolder}" 
+                  value="#{DialogManager.bean.workflowProperties.approveFolder}" 
                   initialSelection="#{NavigationBean.currentNode.nodeRefAsString}"
                   styleClass="selector" /><f:verbatim></td>
    		</tr>
@@ -120,7 +120,7 @@
    </tr>
    <tr>
    	<td></f:verbatim><h:selectOneRadio id="reject-step-present"
-   		value="#{EditSimpleWorkflowDialog.workflowProperties.rejectStepPresent}"
+   		value="#{DialogManager.bean.workflowProperties.rejectStepPresent}"
    		onclick="javascript:checkButtonState();">
    		<f:selectItem itemValue="yes" itemLabel="#{msg.yes}" />
    		<f:selectItem itemValue="no" itemLabel="#{msg.no}" />
@@ -137,7 +137,7 @@
    					<td><nobr> </f:verbatim><h:outputText
    						value="#{msg.name_reject_step}" /><f:verbatim>:&nbsp; </f:verbatim><h:inputText
    						id="reject-step-name"
-   						value="#{EditSimpleWorkflowDialog.workflowProperties.rejectStepName}"
+   						value="#{DialogManager.bean.workflowProperties.rejectStepName}"
    						onkeyup="javascript:checkButtonState();" /><f:verbatim> </nobr></td>
    				</tr>
    				<tr>
@@ -161,7 +161,7 @@
    							<td style="padding-top:6px;"></f:verbatim><r:ajaxFolderSelector
 							      id="clientRejectFolder"
             			      label="#{msg.select_destination_prompt}" 
-                           value="#{EditSimpleWorkflowDialog.workflowProperties.rejectFolder}" 
+                           value="#{DialogManager.bean.workflowProperties.rejectFolder}" 
                            initialSelection="#{NavigationBean.currentNode.nodeRefAsString}"
                            styleClass="selector" /><f:verbatim></td>
    						</tr>
diff --git a/source/web/jsp/spaces/edit-simple-workflow.jsp b/source/web/jsp/spaces/edit-simple-workflow.jsp
index 1e81027eb3..2490d50591 100644
--- a/source/web/jsp/spaces/edit-simple-workflow.jsp
+++ b/source/web/jsp/spaces/edit-simple-workflow.jsp
@@ -80,7 +80,7 @@
 		<tr>
 			<td><nobr></f:verbatim><h:outputText value="#{msg.name_approve_step}" /><f:verbatim>:</nobr></td>
 			<td width="90%"></f:verbatim><h:inputText id="approve-step-name"
-				value="#{EditSimpleWorkflowDialog.workflowProperties.approveStepName}"
+				value="#{DialogManager.bean.workflowProperties.approveStepName}"
 				onkeyup="javascript:checkButtonState();" /><f:verbatim></td>
 		</tr>
 		<tr>
@@ -94,7 +94,7 @@
 			<table cellpadding="2" cellspacing="2" border="0">
 				<tr>
 					<td valign="top"></f:verbatim><h:selectOneRadio
-						value="#{EditSimpleWorkflowDialog.workflowProperties.approveAction}">
+						value="#{DialogManager.bean.workflowProperties.approveAction}">
 						<f:selectItem itemValue="move" itemLabel="Move" />
 						<f:selectItem itemValue="copy" itemLabel="Copy" />
 					</h:selectOneRadio><f:verbatim></td>
@@ -105,7 +105,7 @@
 					<td style="padding-top:6px;"></f:verbatim><r:ajaxFolderSelector
    			      id="clientApproveFolder"
    			      label="#{msg.select_destination_prompt}" 
-                  value="#{EditSimpleWorkflowDialog.workflowProperties.approveFolder}" 
+                  value="#{DialogManager.bean.workflowProperties.approveFolder}" 
                   initialSelection="#{NavigationBean.currentNode.nodeRefAsString}"
                   styleClass="selector" /><f:verbatim></td>
 				</tr>
@@ -124,7 +124,7 @@
 		</tr>
 		<tr>
 			<td></f:verbatim><h:selectOneRadio id="reject-step-present"
-				value="#{EditSimpleWorkflowDialog.workflowProperties.rejectStepPresent}"
+				value="#{DialogManager.bean.workflowProperties.rejectStepPresent}"
 				onclick="javascript:checkButtonState();">
 				<f:selectItem itemValue="yes" itemLabel="#{msg.yes}" />
 				<f:selectItem itemValue="no" itemLabel="#{msg.no}" />
@@ -141,7 +141,7 @@
 							<td><nobr> </f:verbatim><h:outputText
 								value="#{msg.name_reject_step}" /><f:verbatim>:&nbsp; </f:verbatim><h:inputText
 								id="reject-step-name"
-								value="#{EditSimpleWorkflowDialog.workflowProperties.rejectStepName}"
+								value="#{DialogManager.bean.workflowProperties.rejectStepName}"
 								onkeyup="javascript:checkButtonState();" /><f:verbatim> </nobr></td>
 						</tr>
 						<tr>
@@ -154,7 +154,7 @@
 							<table cellpadding="2" cellspacing="2" border="0">
 								<tr>
 									<td valign="top"></f:verbatim><h:selectOneRadio
-										value="#{EditSimpleWorkflowDialog.workflowProperties.rejectAction}">
+										value="#{DialogManager.bean.workflowProperties.rejectAction}">
 										<f:selectItem itemValue="move" itemLabel="#{msg.move}" />
 										<f:selectItem itemValue="copy" itemLabel="#{msg.copy}" />
 									</h:selectOneRadio><f:verbatim></td>
@@ -165,7 +165,7 @@
 									<td style="padding-top:6px;"></f:verbatim><r:ajaxFolderSelector
    							      id="clientRejectFolder"
                			      label="#{msg.select_destination_prompt}" 
-                              value="#{EditSimpleWorkflowDialog.workflowProperties.rejectFolder}" 
+                              value="#{DialogManager.bean.workflowProperties.rejectFolder}" 
                               initialSelection="#{NavigationBean.currentNode.nodeRefAsString}"
                               styleClass="selector" /><f:verbatim></td>
 								</tr>