diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view.xml
index b25a15ae27a0664c9d1c7c3a6370938e37872947..aa23cdd8df406f4ddcd9a2d30a56105a67c0683e 100644
--- a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view.xml
+++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view.xml
@@ -30,9 +30,7 @@
         </item>
         <item>
             <key> <string>condition</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-            </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
@@ -56,7 +54,7 @@
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <float>1.0</float> </value>
+            <value> <float>1.5</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
@@ -88,23 +86,4 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>python: False</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/web_view.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/web_view.xml
index 4c1cf7244b7c7c05f134fc0943ad187256d12e06..07e042eee4efc3c1036e6afe7e322fb14bdaf70a 100644
--- a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/web_view.xml
+++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/web_view.xml
@@ -56,7 +56,7 @@
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <float>1.5</float> </value>
+            <value> <float>1.0</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
@@ -102,7 +102,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>python: True</string> </value>
+            <value> <string>python: hasattr(request, \'web_site_value\') and not (getattr(request, \'ignore_layout\', False) or getattr(request, \'editable_mode\', False))</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebPage_viewAsWeb.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebPage_viewAsWeb.xml
index 1e45b26db6ac25eab16b6db03052e7b2763d9b63..12841c4eb1f0d9122b3f24071892ef388b050677 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebPage_viewAsWeb.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebPage_viewAsWeb.xml
@@ -104,7 +104,7 @@
         </item>
         <item>
             <key> <string>name</string> </key>
-            <value> <string>WebPage_view</string> </value>
+            <value> <string>WebPage_viewAsWeb</string> </value>
         </item>
         <item>
             <key> <string>pt</string> </key>
diff --git a/bt5/erp5_web/bt/change_log b/bt5/erp5_web/bt/change_log
index f411ed4800d468c8ea317b1a43b8ad2eba1eacee..ea7a270932a0b6654464a681db767c84095b9a01 100644
--- a/bt5/erp5_web/bt/change_log
+++ b/bt5/erp5_web/bt/change_log
@@ -4,7 +4,7 @@
 * Set the default Webmaster User ID at Web Site creation.
 * Webmaster and ID are now required.
 Rename "Webmaster" to "Webmaster User ID" to avoid confusion.
-* Add alternate Web Page view with dummy guards.
+* Add alternate Web Page view for web mode.
 
 2006-08-31 Stefan
 * WebSection_getDocumentValueList now returns the newest version for each
diff --git a/bt5/erp5_web/bt/revision b/bt5/erp5_web/bt/revision
index a540f59f28285c7848d5836124730005b529fea0..55663e5ead480ae5528e47d004baa6d34c3043c5 100644
--- a/bt5/erp5_web/bt/revision
+++ b/bt5/erp5_web/bt/revision
@@ -1 +1 @@
-301
\ No newline at end of file
+304
\ No newline at end of file
diff --git a/bt5/erp5_web/bt/version b/bt5/erp5_web/bt/version
index f43e370ec6e450d86b2c17053a9348f313e6b6ca..719cd124d7a63ed6a5e4d2c68e5b04cc6a5faf0c 100644
--- a/bt5/erp5_web/bt/version
+++ b/bt5/erp5_web/bt/version
@@ -1 +1 @@
-0.3.18
\ No newline at end of file
+0.3.19
\ No newline at end of file