diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index 42a26b3cb49..6404daecfa1 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -74,8 +74,9 @@
                                     </div>
                                     <div class="collapse navbar-collapse navbar-top-collapse">
                                         <ul class="nav navbar-nav navbar-right" id="top_menu">
-                                            <li><a href="/page/website.contactus">Contact us</a></li>
-                                            <li><a href="/admin">Sign in</a></li>
+                                            <li name="contactus"><a href="/page/website.contactus">Contact us</a></li>
+                                            <li t-if="user_id.id == website.public_user.id"><a href="/admin">Sign in</a></li>
+                                            <li t-if="user_id.id != website.public_user.id"><a href="/admin"><t t-field="user_id.name"/></a></li>
                                             <li t-if="len(website.language_ids) &gt; 1" class="dropdown">
                                                 <!-- TODO: use flags for language selection -->
                                                 <t t-set="lang_selected" t-value="[lg for lg in website.language_ids if lg.code == lang]"/>
diff --git a/addons/website/website.py b/addons/website/website.py
index 3b97edc9751..0e2d89e08bc 100644
--- a/addons/website/website.py
+++ b/addons/website/website.py
@@ -91,6 +91,7 @@ class website(osv.osv):
     def render(self, cr, uid, ids, template, values=None):
         view = request.registry.get("ir.ui.view")
         IMD = request.registry.get("ir.model.data")
+        user = request.registry.get("res.users")
 
         qweb_context = request.context.copy()
 
@@ -103,6 +104,7 @@ class website(osv.osv):
             'json': simplejson,
             'website': request.website,
             'res_company': request.website.company_id,
+            'user_id': user.browse(cr, openerp.SUPERUSER_ID, uid),
         })
 
         qweb_context.update(values)
diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index 30dd04bce98..02ffda03bd4 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -13,7 +13,7 @@
     <!-- Layout add nav and footer -->
 
     <template id="header_footer_custom" inherit_id="website.layout">
-        <xpath expr="//body/header//ul[@id='top_menu']/li[last()]" position="before">
+        <xpath expr="//body/header//ul[@id='top_menu']/li[@name='contactus']" position="before">
             <li><a href="/blog/%(website_mail.website_mail_blog)d/">News</a></li>
         </xpath>
         <xpath expr="//body/footer//div[@name='info']/ul" position="inside">