diff --git a/templates/nav.jade b/templates/nav.jade
index 0f9d3038..946a4581 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 + redirect)}") Logout
+        li: a(href="#{loginDomain}/logout?dest=#{encodeURIComponent(baseUrl + page)}") 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 + redirect)}") Login
+        li: a(href="#{loginDomain}/login?dest=#{encodeURIComponent(baseUrl + page)}") Login
         li: a(href="#{loginDomain}/register") Register
 
 mixin navloginlogout(redirect)
@@ -70,4 +70,4 @@ mixin navlogoutform(redirect)
   p#logoutform.navbar-text.pull-right
     span#welcome Welcome, #{loginName}
     span  · 
-    a#logout.navbar-link(href="#{loginDomain}/logout?dest=#{encodeURIComponent(baseUrl + redirect)}&_csrf=#{csrfToken}") Logout
\ No newline at end of file
+    a#logout.navbar-link(href="/logout?dest=#{encodeURIComponent(baseUrl + redirect)}&_csrf=#{csrfToken}") Logout
\ No newline at end of file