diff --git a/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java b/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
index f48beba988..0eac6ba7cc 100644
--- a/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
+++ b/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
@@ -820,7 +820,7 @@ public class AVMBrowseBean implements IContextListener
       String[] parts = path.split("[-:]");
       String storename = parts[0];
       String username = parts[1];
-      setupSandboxActionImpl(username, AVMConstants.buildAVMUserMainStoreName(storename, username));
+      setupSandboxActionImpl(AVMConstants.buildAVMUserMainStoreName(storename, username), username);
       setupContentAction(path, true);
    }
    
diff --git a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
index 3d99c230c3..7a6c133f42 100644
--- a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
@@ -139,6 +139,7 @@ public class SubmitDialog extends BaseDialogBean
       this.warningItems = null;
       this.workflowItems = null;
       this.workflows = new HashSet<FormWorkflowWrapper>(4);
+      this.workflowSelectedValue = null;
       
       // walk all the web forms attached the website, and lookup the workflow defaults for each
       NodeRef websiteRef = this.avmBrowseBean.getWebsite().getNodeRef();