diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index ce603b6862..8122c9e1e7 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -865,6 +865,7 @@ edit_website_desc=This wizard helps you modify the settings for a web project sp
 edit_website_finish_instruction=To close this wizard and save the modified settings for your web project space click Finish. To review or change your selections click Back.
 edit_website=Edit Web Project Settings
 workflow_settings=Workflow Settings
+workflow_not_configured=Workflow not configured
 error_filename_pattern=Error with workflow filename pattern: {0}
 
 # Invite web users wizard messages
@@ -968,6 +969,7 @@ submit_comment=Comment
 submit_snapshotlabel=Snapshot Label
 submit_workflow_selection=Use the following workflow to submit all modified items
 submit_not_submit_warning=The following items will not be submitted
+submit_no_workflow_warning=No suitable workflows could be found for the modified items below
 submit_submit_info=The following items will be submitted
 submit_items_title=Submit Items
 submit_items_desc=This page helps you to submit modified items for publishing on the website.
diff --git a/config/alfresco/web-client-config-wcm-actions.xml b/config/alfresco/web-client-config-wcm-actions.xml
index d201f94a29..3de257fa48 100644
--- a/config/alfresco/web-client-config-wcm-actions.xml
+++ b/config/alfresco/web-client-config-wcm-actions.xml
@@ -308,8 +308,9 @@
          <!-- Actions Menu for More Actions in Web Project screen -->
          <action-group id="browse_website_menu">
             <action idref="details_space" />
-            <action idref="delete_space" />
+            <action idref="edit_website" />
             <action idref="invite_website_users" />
+            <action idref="delete_space" />
          </action-group>
          
       </actions>
diff --git a/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java b/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java
index 7b5a3950f1..955a1d76e2 100644
--- a/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java
@@ -187,14 +187,18 @@ public class CreateWebContentWizard extends BaseContentWizard
       final int step = Application.getWizardManager().getCurrentStep();
       if (step == 3)
       {
-         try
+         // if rendering a form, then save the content now to generate the renditions
+         if (MimetypeMap.MIMETYPE_XML.equals(this.mimeType))
          {
-            this.saveContent();
-         }
-         catch (Exception e)
-         {
-            Application.getWizardManager().getState().setCurrentStep(step - 1);
-            Utils.addErrorMessage(e.getMessage(), e);
+            try
+            {
+               this.saveContent();
+            }
+            catch (Exception e)
+            {
+               Application.getWizardManager().getState().setCurrentStep(step - 1);
+               Utils.addErrorMessage(e.getMessage(), e);
+            }
          }
       }
       return super.next();
@@ -231,6 +235,7 @@ public class CreateWebContentWizard extends BaseContentWizard
    @Override
    public String finish()
    {
+      // if a form is not being entered, then save just html/text content
       if (this.formInstanceData == null || this.renditions == null)
       {
          try
diff --git a/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java b/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
index 219d045087..11d77820f2 100644
--- a/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
@@ -542,7 +542,7 @@ public class CreateWebsiteWizard extends BaseWizardBean
    }
    
    /**
-    * Action method to setup a form for dialog context for the current row
+    * Action handler to setup a form for dialog context for the current row
     */
    public void setupFormAction(ActionEvent event)
    {
diff --git a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
index 7a6c133f42..bafa873690 100644
--- a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
@@ -368,6 +368,14 @@ public class SubmitDialog extends BaseDialogBean
       return this.workflowItems;
    }
    
+   /**
+    * @return size of the workflow selection list
+    */
+   public int getWorkflowListSize()
+   {
+      return getWorkflowList().size();
+   }
+   
    /**
     * @return the List of bean items to show in the Submit list
     */
diff --git a/source/web/jsp/wcm/create-website-wizard/forms.jsp b/source/web/jsp/wcm/create-website-wizard/forms.jsp
index dcc7da8b2a..c7ad0cf8f0 100644
--- a/source/web/jsp/wcm/create-website-wizard/forms.jsp
+++ b/source/web/jsp/wcm/create-website-wizard/forms.jsp
@@ -33,6 +33,7 @@
       </a:selectList>
       <f:verbatim></div></f:verbatim>
    </h:panelGroup>
+   <h:commandButton value="#{msg.create_form}" style="margin:2px" styleClass="dialogControls" action="wizard:createForm" />
    
    <%-- Selected Form table, with configuration buttons and info text --%>
    <f:verbatim><div style='padding:4px'></div></f:verbatim>
@@ -47,6 +48,8 @@
             <h:outputText value="#{msg.name}" />
          </f:facet>
          <h:outputText value="#{row.title}" />
+         <h:graphicImage url="/images/icons/warning.gif" style="padding:2px" width="16" height="16"
+               rendered="#{row.workflow != null && row.workflow.params == null}" title="#{msg.workflow_not_configured}" />
       </h:column>
       <h:column>
          <f:facet name="header">
diff --git a/source/web/jsp/wcm/create-website-wizard/settings.jsp b/source/web/jsp/wcm/create-website-wizard/settings.jsp
index 52be48cc53..564c7a5137 100644
--- a/source/web/jsp/wcm/create-website-wizard/settings.jsp
+++ b/source/web/jsp/wcm/create-website-wizard/settings.jsp
@@ -47,6 +47,8 @@
             <h:outputText value="#{msg.name}" />
          </f:facet>
          <h:outputText value="#{row.title}" />
+         <h:graphicImage url="/images/icons/warning.gif" style="padding:2px" width="16" height="16"
+               rendered="#{row.params == null}" title="#{msg.workflow_not_configured}" />
       </h:column>
       <h:column>
          <f:facet name="header">
diff --git a/source/web/jsp/wcm/submit-dialog.jsp b/source/web/jsp/wcm/submit-dialog.jsp
index 0a8862bd29..98ffbb647e 100644
--- a/source/web/jsp/wcm/submit-dialog.jsp
+++ b/source/web/jsp/wcm/submit-dialog.jsp
@@ -69,11 +69,19 @@
 </h:panelGrid>
 
 <h:panelGrid columns="1" cellpadding="2" cellpadding="2" width="100%" style="margin-left:8px">
-   <h:outputText value="#{msg.submit_workflow_selection}"/>
+   <h:outputText value="#{msg.submit_workflow_selection}" rendered="#{DialogManager.bean.workflowListSize != 0}" />
    <a:selectList id="workflow-list" multiSelect="false" styleClass="selectListTable" itemStyleClass="selectListItem"
-         value="#{DialogManager.bean.workflowSelectedValue}">
+         value="#{DialogManager.bean.workflowSelectedValue}" rendered="#{DialogManager.bean.workflowListSize != 0}">
       <a:listItems value="#{DialogManager.bean.workflowList}" />
    </a:selectList>
+   <h:panelGroup rendered="#{DialogManager.bean.workflowListSize == 0}">
+      <f:verbatim><% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %></f:verbatim>
+      <h:panelGrid columns="2" cellpadding="0" cellpadding="0">
+         <h:graphicImage url="/images/icons/warning.gif" style="padding-top:2px;padding-right:4px" width="16" height="16"/>
+         <h:outputText styleClass="mainSubText" value="#{msg.submit_no_workflow_warning}" />
+      </h:panelGrid>
+      <f:verbatim><% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %></f:verbatim>
+   </h:panelGroup>
 </h:panelGrid>
 
 <h:panelGrid columns="1" cellpadding="2" style="padding-top:16px;padding-bottom:4px;"