diff --git a/templates/nav.jade b/templates/nav.jade
index 9dcc24e8..0f9d3038 100644
--- a/templates/nav.jade
+++ b/templates/nav.jade
@@ -27,13 +27,13 @@ mixin navdefaultlinks(page)
       b.caret
     ul.dropdown-menu
       if loggedIn
-        li: a(href="#{loginDomain}/logout?dest=#{encodeURIComponent(baseUrl + page)}") Logout
+        li: a(href="#{loginDomain}/logout?dest=#{encodeURIComponent(baseUrl + redirect)}") Logout
         li.divider
         li: a(href="#{loginDomain}/account/channels") Channels
         li: a(href="#{loginDomain}/account/profile") Profile
         li: a(href="#{loginDomain}/account/edit") Change Password/Email
       else
-        li: a(href="#{loginDomain}/login?dest=#{encodeURIComponent(baseUrl + page)}") Login
+        li: a(href="#{loginDomain}/login?dest=#{encodeURIComponent(baseUrl + redirect)}") Login
         li: a(href="#{loginDomain}/register") Register
 
 mixin navloginlogout(redirect)