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 cf38af1e0ba91c86bf6b09d9f15a12f0253bebd9..878c1499db13d77e6c1124bd3ba12282c3f06dde 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
@@ -57,15 +57,14 @@
   <div style="background-image: url(img/erp5-website-logo.png); background-repeat:no-repeat; height: 40px;padding-top: 20px; padding-left: 130px;">\n
     <span class="onright">\n
       <tal:block tal:condition="here/portal_membership/isAnonymousUser">\n
-        <a class="login" href="EGov_viewLoginForm" i18n:translate="" i18n:domain="ui">Login</a>\n
+        <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
         <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\'] != \'view\'">\n
         <a class="home" tal:attributes="href python:context.getWebSiteValue().absolute_url()" \n
           href="./home" i18n:translate="" i18n:domain="ui">Home</a>\n
-      </tal:block>\n
       <tal:block tal:condition="not:here/portal_membership/isAnonymousUser">\n
         <a class="preferences" href="./preferences" i18n:translate="" i18n:domain="ui">Preferences</a>\n
       </tal:block>\n
diff --git a/bt5/erp5_egov/bt/revision b/bt5/erp5_egov/bt/revision
index f71beab75f5697f6169cfd1d9147fcee958c1038..06690d5eea4908c3d87a6feec2f257bea8cee370 100644
--- a/bt5/erp5_egov/bt/revision
+++ b/bt5/erp5_egov/bt/revision
@@ -1 +1 @@
-237
\ No newline at end of file
+238
\ No newline at end of file