diff --git a/config/alfresco/bootstrap-context.xml b/config/alfresco/bootstrap-context.xml
index b3a27f81c1..570d757c9f 100644
--- a/config/alfresco/bootstrap-context.xml
+++ b/config/alfresco/bootstrap-context.xml
@@ -229,6 +229,11 @@
                     <prop key="location">alfresco/bootstrap/customWorkflowDefsSpace.acp</prop>
                 </props>
 
+                <props>
+                    <prop key="path">/${spaces.company_home.childname}/${spaces.dictionary.childname}</prop>
+                    <prop key="location">alfresco/bootstrap/formsSpace.xml</prop>
+                </props>
+                
             </list>
         </property>
     </bean>
diff --git a/config/alfresco/messages/bootstrap-spaces.properties b/config/alfresco/messages/bootstrap-spaces.properties
index 39166b11fb..cb7aa8fc63 100644
--- a/config/alfresco/messages/bootstrap-spaces.properties
+++ b/config/alfresco/messages/bootstrap-spaces.properties
@@ -30,8 +30,11 @@ spaces.scripts.description=JavaScript files
 spaces.wcm.name=Web Projects
 spaces.wcm.description=Web Content Management Spaces
 
-spaces.content_forms.name=Web Forms
-spaces.content_forms.description=Web Content Forms
+spaces.wcm_content_forms.name=Web Forms
+spaces.wcm_content_forms.description=Web Content Forms
 
 spaces.user_homes.name=User Homes
 spaces.user_homes.description=User Homes
+
+spaces.content_forms.name=Forms
+spaces.content_forms.description=Content Forms
diff --git a/source/java/org/alfresco/repo/admin/patch/impl/WCMFoldersPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/WCMFoldersPatch.java
index 3baa2a65cb..89cfb0b9ec 100644
--- a/source/java/org/alfresco/repo/admin/patch/impl/WCMFoldersPatch.java
+++ b/source/java/org/alfresco/repo/admin/patch/impl/WCMFoldersPatch.java
@@ -63,9 +63,9 @@ public class WCMFoldersPatch extends AbstractPatch
     public static final String PROPERTY_WEBPROJECTS_FOLDER_CHILDNAME = "spaces.wcm.childname";
     private static final String MSG_WEBPROJECTS_FOLDER_NAME = "spaces.wcm.name";
     private static final String MSG_WEBPROJECTS_FOLDER_DESCRIPTION = "spaces.wcm.description";
-    public static final String PROPERTY_WEBFORMS_FOLDER_CHILDNAME = "spaces.content_forms.childname";
-    private static final String MSG_WEBFORMS_FOLDER_NAME = "spaces.content_forms.name";
-    private static final String MSG_WEBFORMS_FOLDER_DESCRIPTION = "spaces.content_forms.description";
+    public static final String PROPERTY_WEBFORMS_FOLDER_CHILDNAME = "spaces.wcm_content_forms.childname";
+    private static final String MSG_WEBFORMS_FOLDER_NAME = "spaces.wcm_content_forms.name";
+    private static final String MSG_WEBFORMS_FOLDER_DESCRIPTION = "spaces.wcm_content_forms.description";
     
     private static final String PROPERTY_ICON = "space-icon-default";