diff --git a/static/skin/index.js b/static/skin/index.js
index 072ab59ab..06147f88b 100644
--- a/static/skin/index.js
+++ b/static/skin/index.js
@@ -15,6 +15,7 @@
     let noResultInjected = false;
     let filters = getCookie(filterCookieName);
     let params = new URLSearchParams(window.location.search || filters || '');
+    params.delete('userlang');
     let timer;
     let languages = {};
 
@@ -34,9 +35,8 @@
     function changeUILanguage() {
       const s = document.getElementById("ui_language");
       const lang = s.options[s.selectedIndex].value;
-      const q = new URLSearchParams(window.location.search);
-      q.set("userlang", lang);
-      location.search = q.toString();
+      setPermanentGlobalCookie('userlang', lang);
+      window.location.reload();
     }
 
     function queryUrlBuilder() {
diff --git a/test/server.cpp b/test/server.cpp
index 6188ee30f..ce3836c90 100644
--- a/test/server.cpp
+++ b/test/server.cpp
@@ -63,7 +63,7 @@ const ResourceCollection resources200Compressible{
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.css" },
   { STATIC_CONTENT,  "/ROOT%23%3F/skin/index.css?cacheid=ac5767d8" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.js" },
-  { STATIC_CONTENT,  "/ROOT%23%3F/skin/index.js?cacheid=f045ea14" },
+  { STATIC_CONTENT,  "/ROOT%23%3F/skin/index.js?cacheid=5b1775c2" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/iso6391To3.js" },
   { STATIC_CONTENT,  "/ROOT%23%3F/skin/iso6391To3.js?cacheid=ecde2bb3" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/isotope.pkgd.min.js" },
@@ -284,7 +284,7 @@ R"EXPECTEDRESULT(      href="/ROOT%23%3F/skin/index.css?cacheid=ac5767d8"
     <script type="text/javascript" src="/ROOT%23%3F/skin/languages.js?cacheid=fe100348" defer></script>
     <script src="/ROOT%23%3F/skin/isotope.pkgd.min.js?cacheid=2e48d392" defer></script>
     <script src="/ROOT%23%3F/skin/iso6391To3.js?cacheid=ecde2bb3"></script>
-    <script type="text/javascript" src="/ROOT%23%3F/skin/index.js?cacheid=f045ea14" defer></script>
+    <script type="text/javascript" src="/ROOT%23%3F/skin/index.js?cacheid=5b1775c2" defer></script>
       <img src="/ROOT%23%3F/skin/feed.png?cacheid=56a672b1"
 )EXPECTEDRESULT"
     },