diff --git a/config/alfresco/web-client-config-workflow.xml b/config/alfresco/web-client-config-workflow.xml
index 43538372a4..e0c9fe19aa 100644
--- a/config/alfresco/web-client-config-workflow.xml
+++ b/config/alfresco/web-client-config-workflow.xml
@@ -72,6 +72,30 @@
          <show-property name="bpm:priority" ignore-if-missing="false" />
       </property-sheet>
    </config>
+
+   <!-- WCM Workflow Submit. -->
+
+   <config evaluator="node-type" condition="wcmwf:startSubmit">
+       <property-sheet>
+           <separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
+           <show-property name="wcmwf:description" ignore-if-missing="false" />
+           <show-property name="wcmwf:sourcePath" ignore-if-missing="false" />
+           <separator name="sep2" display-label-id="users_and_roles" component-generator="HeaderSeparatorGenerator" />
+           <show-association name="wcmwf:assignee" ignore-if-missing="false" />
+       </property-sheet>
+   </config>
+
+   <config evaluator="node-type" condition="wcwmf:review">
+       <property-sheet>
+           <separator name="sep1" display-label-id="general" component-generator="HeaderSeparatorGenerator" />
+           <show-property name="bpm:taskId" ignore-if-missing="false" />
+           <show-property name="wcmwf:description" ignore-if-missing="false" />
+           <show-property name="wcmwf:sourcePath" 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>
    
    <!--         -->
    <!-- Actions -->
diff --git a/source/java/org/alfresco/web/bean/wcm/AVMConstants.java b/source/java/org/alfresco/web/bean/wcm/AVMConstants.java
index b497ee0101..c1de34427f 100644
--- a/source/java/org/alfresco/web/bean/wcm/AVMConstants.java
+++ b/source/java/org/alfresco/web/bean/wcm/AVMConstants.java
@@ -69,6 +69,6 @@ public final class AVMConstants
    public final static String PROP_SANDBOX_AUTHOR_MAIN = ".sandbox.author.main";
    public final static String PROP_SANDBOX_AUTHOR_PREVIEW = ".sandbox.author.preview";
    public final static String PROP_DNS = ".dns.";
-   
+   public final static String PROP_WEBSITE_NAME = ".website.name";
    public final static String SPACE_ICON_WEBSITE = "space-icon-website";
 }
diff --git a/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java b/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
index 7061e2a7c0..5e1b307f50 100644
--- a/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
@@ -274,7 +274,7 @@ public class CreateWebsiteWizard extends BaseWizardBean
       //this.fileFolderService.create(AVMNodeConverter.ToNodeRef(-1, path), AVMConstants.DIR_APPBASE, ContentModel.TYPE_AVM_PLAIN_FOLDER);
       
       // tag the store with the store type
-      this.avmService.setStoreProperty(stagingStore,
+      this.avmService.setStoreProperty(previewStore,
             QName.createQName(null, AVMConstants.PROP_SANDBOX_STAGING_PREVIEW),
             new PropertyValue(DataTypeDefinition.TEXT, null));
       
@@ -324,6 +324,12 @@ public class CreateWebsiteWizard extends BaseWizardBean
       this.avmService.setStoreProperty(userStore,
             QName.createQName(null, AVMConstants.PROP_SANDBOX_AUTHOR_MAIN),
             new PropertyValue(DataTypeDefinition.TEXT, null));
+
+      // tag the store with the base name of the website so that corresponding
+      // staging areas can be found.
+      this.avmService.setStoreProperty(userStore,
+            QName.createQName(null, AVMConstants.PROP_WEBSITE_NAME),
+            new PropertyValue(DataTypeDefinition.TEXT, name));
       
       // tag the store with the DNS name property
       tagStoreDNSPath(userStore);