diff --git a/config/alfresco/model/applicationModel.xml b/config/alfresco/model/applicationModel.xml
index 23ff8df578..5f2a4afbf5 100644
--- a/config/alfresco/model/applicationModel.xml
+++ b/config/alfresco/model/applicationModel.xml
@@ -60,6 +60,9 @@
             <property name="app:avmstore">
                <type>d:text</type>
             </property>
+            <property name="app:defaultwebapp">
+               <type>d:text</type>
+            </property>
          </properties>
          <associations>
             <child-association name="app:webuser">
diff --git a/source/java/org/alfresco/model/ContentModel.java b/source/java/org/alfresco/model/ContentModel.java
index 271b8249dd..0b15dab12c 100644
--- a/source/java/org/alfresco/model/ContentModel.java
+++ b/source/java/org/alfresco/model/ContentModel.java
@@ -235,6 +235,7 @@ public interface ContentModel
     // AVM web folder
     static final QName TYPE_AVMWEBFOLDER = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webfolder");
     static final QName PROP_AVMSTORE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "avmstore");
+    static final QName PROP_DEFAULTWEBAPP = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "defaultwebapp");
     static final QName ASSOC_WEBUSER = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webuser");
     static final QName ASSOC_WEBFORM = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webform");
     static final QName ASSOC_WEBWORKFLOWDEFAULTS = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "webworkflowdefaults");
diff --git a/source/java/org/alfresco/repo/avm/actions/SimpleAVMSubmitAction.java b/source/java/org/alfresco/repo/avm/actions/SimpleAVMSubmitAction.java
index 127895f137..0cabf9bc15 100644
--- a/source/java/org/alfresco/repo/avm/actions/SimpleAVMSubmitAction.java
+++ b/source/java/org/alfresco/repo/avm/actions/SimpleAVMSubmitAction.java
@@ -117,7 +117,8 @@ public class SimpleAVMSubmitAction extends ActionExecuterAbstractBase
             fAVMSyncService.compare(version, path, -1, avmDest);
         // TODO fix update comments at some point.
         // Do the update.
-        fAVMSyncService.update(diffs, false, false, true, true, null, null);
+        fAVMSyncService.update(diffs, false, false, true, true,
+              "Submit of item: " + AVMNodeConverter.SplitBase(path)[1], null);
         // Cleanup by flattening the source relative to the destination.
         AVMDAOs.Instance().fAVMNodeDAO.flush();
         fAVMSyncService.flatten(storePath[0] + ":/appBase", websiteName + "-staging:/appBase");