diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json
index 8e307daca..b9d5337b1 100644
--- a/packages/ui-default/package.json
+++ b/packages/ui-default/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/ui-default",
-  "version": "4.11.23",
+  "version": "4.11.24",
   "author": "undefined <i@undefined.moe>",
   "license": "AGPL-3.0",
   "main": "hydro.js",
diff --git a/packages/ui-default/pages/home_preference.page.jsx b/packages/ui-default/pages/home_preference.page.jsx
index 94761a872..8831a74c7 100644
--- a/packages/ui-default/pages/home_preference.page.jsx
+++ b/packages/ui-default/pages/home_preference.page.jsx
@@ -124,6 +124,7 @@ const page = new NamedPage('home_preference', async () => {
       $('#codelang-main-select').val(m);
       onChangeMain.call({ value: $('#codelang-main-select').val() });
       $('#codelang-sub-select').val(current);
+      $('[name="codeLang"]').val(current);
     } else $('#codelang-main-select').val(current);
 
     if (success) {
diff --git a/packages/ui-default/pages/problem_submit.page.js b/packages/ui-default/pages/problem_submit.page.js
index be6490c02..9007b600e 100644
--- a/packages/ui-default/pages/problem_submit.page.js
+++ b/packages/ui-default/pages/problem_submit.page.js
@@ -44,6 +44,7 @@ const page = new NamedPage(['problem_submit', 'contest_detail_problem_submit', '
     $('#codelang-main-select').val(m);
     onChangeMain.call({ value: $('#codelang-main-select').val() });
     $('#codelang-sub-select').val(current);
+    $('[name="lang"]').val(current);
   } else $('#codelang-main-select').val(current);
 });