diff --git a/browser/node_macros.pt b/browser/node_macros.pt
index b350c24..88f7243 100644
--- a/browser/node_macros.pt
+++ b/browser/node_macros.pt
@@ -324,11 +324,12 @@
 <metal:login define-macro="login">
     <div>
       <a href="login.html"
-            i18n:translate="">Log in</a></div>
+         tal:attributes="href string:${view/topMenu/url}/login.html"
+         i18n:translate="">Log in</a></div>
     <div tal:define="register python:view.globalOptions('provideLogin')"
-         tal:condition="register">
-      <a tal:condition="python:register != True"
-         tal:attributes="href python:register[0]"
+         tal:condition="python:register and register != True">
+      <a tal:define="reg python:register[0]"
+         tal:attributes="href string:${view/topMenu/url}/$reg"
          i18n:translate="">Register new member</a></div>
 </metal:login>