diff --git a/static/skin/i18n.js b/static/skin/i18n.js
index 72d7d3b20..d451f11b4 100644
--- a/static/skin/i18n.js
+++ b/static/skin/i18n.js
@@ -92,8 +92,7 @@ function getUserLanguage() {
 }
 
 function setUserLanguage(lang, callback) {
-  const rootPath = new URL('..', import.meta.url).pathname.replace(/\/$/, '');
-  document.cookie = `userlang=${lang};path=${rootPath};max-age=31536000`;
+  setPermanentGlobalCookie('userlang', lang);
   Translations.load(lang);
   Translations.whenReady(callback);
 }
diff --git a/static/skin/viewer.js b/static/skin/viewer.js
index b4fe88a9f..0426aea0e 100644
--- a/static/skin/viewer.js
+++ b/static/skin/viewer.js
@@ -512,3 +512,7 @@ function finishViewerSetupOnceTranslationsAreLoaded()
 
   viewerSetupComplete = true;
 }
+
+function setPermanentGlobalCookie(name, value) {
+  document.cookie = `${name}=${value};path=${root};max-age=31536000`;
+}
diff --git a/test/server.cpp b/test/server.cpp
index d208e5f9a..0ec08c821 100644
--- a/test/server.cpp
+++ b/test/server.cpp
@@ -59,7 +59,7 @@ const ResourceCollection resources200Compressible{
   { DYNAMIC_CONTENT, "/ROOT/skin/favicon/favicon.ico" },
   { STATIC_CONTENT,  "/ROOT/skin/favicon/favicon.ico?cacheid=fba03a27" },
   { DYNAMIC_CONTENT, "/ROOT/skin/i18n.js" },
-  { STATIC_CONTENT,  "/ROOT/skin/i18n.js?cacheid=dcf3d584" },
+  { STATIC_CONTENT,  "/ROOT/skin/i18n.js?cacheid=6da2bca0" },
   { DYNAMIC_CONTENT, "/ROOT/skin/index.css" },
   { STATIC_CONTENT,  "/ROOT/skin/index.css?cacheid=0f9ba34e" },
   { DYNAMIC_CONTENT, "/ROOT/skin/index.js" },
@@ -73,7 +73,7 @@ const ResourceCollection resources200Compressible{
   { DYNAMIC_CONTENT, "/ROOT/skin/taskbar.css" },
   { STATIC_CONTENT,  "/ROOT/skin/taskbar.css?cacheid=2cbac34b" },
   { DYNAMIC_CONTENT, "/ROOT/skin/viewer.js" },
-  { STATIC_CONTENT,  "/ROOT/skin/viewer.js?cacheid=b3c754ec" },
+  { STATIC_CONTENT,  "/ROOT/skin/viewer.js?cacheid=430d45b0" },
   { DYNAMIC_CONTENT, "/ROOT/skin/fonts/Poppins.ttf" },
   { STATIC_CONTENT,  "/ROOT/skin/fonts/Poppins.ttf?cacheid=af705837" },
   { DYNAMIC_CONTENT, "/ROOT/skin/fonts/Roboto.ttf" },
@@ -300,9 +300,9 @@ R"EXPECTEDRESULT(                                <img src="../skin/download.png?
       /* url */ "/ROOT/viewer",
 R"EXPECTEDRESULT(    <link type="text/css" href="./skin/taskbar.css?cacheid=2cbac34b" rel="Stylesheet" />
     <link type="text/css" href="./skin/css/autoComplete.css?cacheid=08951e06" rel="Stylesheet" />
-    <script type="module" src="./skin/i18n.js?cacheid=dcf3d584" defer></script>
+    <script type="module" src="./skin/i18n.js?cacheid=6da2bca0" defer></script>
     <script type="text/javascript" src="./skin/languages.js?cacheid=fe100348" defer></script>
-    <script type="text/javascript" src="./skin/viewer.js?cacheid=b3c754ec" defer></script>
+    <script type="text/javascript" src="./skin/viewer.js?cacheid=430d45b0" defer></script>
     <script type="text/javascript" src="./skin/autoComplete.min.js?cacheid=1191aaaf"></script>
       const blankPageUrl = root + "/skin/blank.html?cacheid=6b1fa032";
           <label for="kiwix_button_show_toggle"><img src="./skin/caret.png?cacheid=22b942b4" alt=""></label>