diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewDGIDHeaderWorkspaceRenderer.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewDGIDHeaderWorkspaceRenderer.xml
index 2119e0b301ecac1a2d5bbbb245bb35986fd3ce0f..f0d0a516d4f2d3620e4bde065e99f8a4bfebb663 100644
--- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewDGIDHeaderWorkspaceRenderer.xml
+++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewDGIDHeaderWorkspaceRenderer.xml
@@ -47,7 +47,7 @@
       <tal:block tal:condition="here/portal_membership/isAnonymousUser">\n
         <a class="login" href="EGov_viewLoginForm" i18n:translate="" i18n:domain="ui">Login</a>\n
       </tal:block>\n
-      <tal:block tal:condition="python: not here.portal_membership.isAnonymousUser() and request[\'current_form_id\'] == \'eGov_viewAdvancedSearchDialog\'">\n
+      <tal:block tal:condition="python: not here.portal_membership.isAnonymousUser()">\n
         <a class="logout" href="WebSite_logout" i18n:translate="" i18n:domain="ui">Logout</a>\n
       </tal:block>\n
       <tal:block tal:condition="python:request[\'current_form_id\'] != \'eGov_viewAdvancedSearchDialog\'">\n
diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderFormRenderer.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderFormRenderer.xml
index 265ce24b25b7a08b15d160ad9a43e792a601a8a7..b9dafa71af10c0783ac5b957f5d9e5836656c420 100644
--- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderFormRenderer.xml
+++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderFormRenderer.xml
@@ -51,7 +51,7 @@
     <span class="onright">\n
       <a class="home" tal:condition="python: context.EGov_checkUserIsAPersonOrOrganisation()==True" tal:attributes="href python:context.getWebSiteValue().absolute_url()" href="./home" \n
         i18n:translate="" i18n:domain="ui">Home</a>\n
-      <a class="logout" tal:condition="python: context.EGov_checkUserIsAPersonOrOrganisation()==False " href="WebSite_logout" i18n:translate="" i18n:domain="ui">Logout</a> \n
+      <a class="logout" href="WebSite_logout" i18n:translate="" i18n:domain="ui">Logout</a> \n
       <tal:block tal:condition="python: context.getPrintFormUrl() is not None">\n
         <a class="print" href="DeclarationTVA_viewDeclarationTVAAsPdf"\n
           tal:attributes="href python: context.getPrintFormUrl()" i18n:translate="" i18n:domain="ui">Print</a>\n
diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderWorkspaceRenderer.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderWorkspaceRenderer.xml
index aa51f2407bd220a6bfe3cc9ff1100414bea12b80..b628765aaedbcdb1b706e638c1e537fa56b6b695 100644
--- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderWorkspaceRenderer.xml
+++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderWorkspaceRenderer.xml
@@ -48,7 +48,7 @@
         <a class="login" tal:attributes="href python:\'%s/EGov_viewLoginForm\' % context.getWebSiteValue().absolute_url()"\n
         href="EGov_viewLoginForm" i18n:translate="" i18n:domain="ui">Login</a>\n
       </tal:block>\n
-      <tal:block tal:condition="python: not here.portal_membership.isAnonymousUser() and request[\'current_form_id\'] == \'view\'">\n
+      <tal:block tal:condition="python: not here.portal_membership.isAnonymousUser()">\n
         <a class="logout" href="WebSite_logout" i18n:translate="" i18n:domain="ui">Logout</a>\n
       </tal:block>\n
         <a class="home" tal:attributes="href python:context.getWebSiteValue().absolute_url()" \n
diff --git a/bt5/erp5_egov/bt/change_log b/bt5/erp5_egov/bt/change_log
index fb0048e8d3ae29cd368f89f04fa38c55ee3d42b5..eae5cc588b7a6bf1a53ea39f7b85979876278c5a 100644
--- a/bt5/erp5_egov/bt/change_log
+++ b/bt5/erp5_egov/bt/change_log
@@ -3,7 +3,8 @@
 * update css
 * add some rights on assignee to the validated state on egov_universal_workflow. This avoid a security error if an agent have an assigned application and refuse it (it will change the state of the application to validated and redirect the agent on it).
 * update some listbox to be able to handle searchable text and to be able to sort application by modification date (descending)
-* make possible to return on the form page, even if the form has been submitted, this permit to see what have been entered in the form, but it's not possible to modify it.
+* make possible to return on the form page, even if the form has been submitted, this permit to see what have been entered in the form, but it's not possible to modify it
+* display logout button on every pages
 
 2008-10-10 fabien
 bring some corrections after the Mme Ba review :
diff --git a/bt5/erp5_egov/bt/revision b/bt5/erp5_egov/bt/revision
index c0220a2ad4043e4791604d21ada3f04a1352acdb..5f7b1b0513963d243e2c08a1bcf9ec14909cbeaf 100644
--- a/bt5/erp5_egov/bt/revision
+++ b/bt5/erp5_egov/bt/revision
@@ -1 +1 @@
-397
\ No newline at end of file
+399
\ No newline at end of file