diff --git a/contrib/templates/default/navbar.mustache b/contrib/templates/default/navbar.mustache
index 5c0fa34..13ad692 100644
--- a/contrib/templates/default/navbar.mustache
+++ b/contrib/templates/default/navbar.mustache
@@ -32,13 +32,13 @@
      |
    </span>
    <span class="navbar-links"> 
-     <span class="navbar-link"><a href="{{prefix}}">{{#i18n.Translations}}{{front_page_title}}{{/i18n.Translations}}</a></span>
+     <span class="navbar-link"><a href="{{prefix}}?lang={{i18n.Name}}">{{#i18n.Translations}}{{front_page_title}}{{/i18n.Translations}}</a></span>
    </span>
    <span class="navbar-sep">
      |
    </span>
    <span class="navbar-links"> 
-     <span class="navbar-link"><a href="{{prefix}}o/">{{#i18n.Translations}}{{overboard_title}}{{/i18n.Translations}}</a></span>
+     <span class="navbar-link"><a href="{{prefix}}o/?lang={{i18n.Name}}">{{#i18n.Translations}}{{overboard_title}}{{/i18n.Translations}}</a></span>
    </span>
    <span class="navbar-sep">
      |
diff --git a/contrib/templates/default/ukko.mustache b/contrib/templates/default/ukko.mustache
index 19f4c3f..a2df689 100644
--- a/contrib/templates/default/ukko.mustache
+++ b/contrib/templates/default/ukko.mustache
@@ -27,17 +27,17 @@
       <div id="ukko_paginator">
         {{#prev}}
           <span id="ukko_prev">
-            <a href="{{prefix}}o/{{no}}/">previous</a>
+            <a href="{{prefix}}o/{{no}}/?lang={{i18n.Name}}">previous</a>
           </span>
         {{/prev}}
         {{#next}}
           <span id="ukko_next">
-            <a href="{{prefix}}o/{{no}}/">next</a>
+            <a href="{{prefix}}o/{{no}}/?lang={{i18n.Name}}">next</a>
           </span>
         {{/next}}
       </div>
       <div id="ukko_threads">
-        <pre><a href="{{prefix}}livechan/">livechan</a></pre>
+        <pre><a href="{{prefix}}livechan/?lang={{i18n.Name}}">livechan</a></pre>
       {{#threads}}
         <div class="thread" id="thread_{{OP.PostHash}}">
 	        <div class="truncated_post">
@@ -78,12 +78,12 @@
       <div id="ukko_paginator">
           {{#prev}}
               <span id="ukko_prev">
-                  <a href="{{prefix}}o/{{no}}/">previous</a>
+                  <a href="{{prefix}}o/{{no}}/?lang={{i18n.Name}}">previous</a>
               </span>
           {{/prev}}
           {{#next}}
               <span id="ukko_next">
-                  <a href="{{prefix}}o/{{no}}/">next</a>
+                  <a href="{{prefix}}o/{{no}}/?lang={{i18n.Name}}">next</a>
               </span>
           {{/next}}
       </div>