diff --git a/application-flashmessages-ui/src/main/resources/Flash/Code/FlashMessagesTemplateProvider.xml b/application-flashmessages-ui/src/main/resources/Flash/Code/FlashMessagesTemplateProvider.xml
index ed38693..10d8f3d 100644
--- a/application-flashmessages-ui/src/main/resources/Flash/Code/FlashMessagesTemplateProvider.xml
+++ b/application-flashmessages-ui/src/main/resources/Flash/Code/FlashMessagesTemplateProvider.xml
@@ -232,7 +232,9 @@
       <action>edit</action>
     </property>
     <property>
-      <creationRestrictions/>
+      <creationRestrictions>
+        <value>Flash</value>
+      </creationRestrictions>
     </property>
     <property>
       <creationRestrictionsAreSuggestions>0</creationRestrictionsAreSuggestions>
@@ -247,9 +249,7 @@
       <name>templateProvider.flashmessages.name</name>
     </property>
     <property>
-      <spaces>
-        <value>Flash</value>
-      </spaces>
+      <spaces/>
     </property>
     <property>
       <template>Flash.FlashTemplate</template>
@@ -258,7 +258,9 @@
       <terminal>1</terminal>
     </property>
     <property>
-      <visibilityRestrictions/>
+      <visibilityRestrictions>
+        <value>Flash</value>
+      </visibilityRestrictions>
     </property>
   </object>
 </xwikidoc>
diff --git a/application-flashmessages-ui/src/main/resources/Flash/WebHome.xml b/application-flashmessages-ui/src/main/resources/Flash/WebHome.xml
index 856300d..f383150 100644
--- a/application-flashmessages-ui/src/main/resources/Flash/WebHome.xml
+++ b/application-flashmessages-ui/src/main/resources/Flash/WebHome.xml
@@ -47,34 +47,6 @@
   {{error}}#getMissingLicenseMessage('flash.extension.name'){{/error}}
 #end
 {{/velocity}}</content>
-  <object>
-    <name>Flash.WebHome</name>
-    <number>0</number>
-    <className>XWiki.DefaultPageTemplateClass</className>
-    <guid>02782f2a-cb25-4a88-b2d6-443d4a894da2</guid>
-    <class>
-      <name>XWiki.DefaultPageTemplateClass</name>
-      <customClass/>
-      <customMapping/>
-      <defaultViewSheet/>
-      <defaultEditSheet/>
-      <defaultWeb/>
-      <nameField/>
-      <validationScript/>
-      <defaultPageTemplate>
-        <disabled>0</disabled>
-        <name>defaultPageTemplate</name>
-        <number>1</number>
-        <prettyName>defaultPageTemplate</prettyName>
-        <size>30</size>
-        <unmodifiable>0</unmodifiable>
-        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-      </defaultPageTemplate>
-    </class>
-    <property>
-      <defaultPageTemplate>Flash.Code.FlashMessagesTemplateProvider</defaultPageTemplate>
-    </property>
-  </object>
   <object>
     <name>Flash.WebHome</name>
     <number>0</number>