diff --git a/app/assets/javascripts/user_edit.js b/app/assets/javascripts/user_edit.js
index eca04cb2..706e92f8 100644
--- a/app/assets/javascripts/user_edit.js
+++ b/app/assets/javascripts/user_edit.js
@@ -32,5 +32,15 @@ $(document).on('turbolinks:load', function(){
     $("#role-dropdown").on("changed.bs.select", function(){
       $("#user_role_id").val($("#role-dropdown").selectpicker('val'))
     })
+
+    // Update hidden field with new value
+    // $("#language-dropdown").on("show.bs.select", function(){
+    //   $("#language-dropdown").selectpicker('val', $("#user_language").val())
+    // })
+    
+    // Update hidden field with new value
+    $("#language-dropdown").on("changed.bs.select", function(){
+      $("#user_language").val($("#language-dropdown").selectpicker('val'))
+    })
   }
 })
\ No newline at end of file
diff --git a/app/views/users/components/_account.html.erb b/app/views/users/components/_account.html.erb
index 0b5f733e..72268317 100644
--- a/app/views/users/components/_account.html.erb
+++ b/app/views/users/components/_account.html.erb
@@ -36,7 +36,13 @@
     <%= f.text_field :provider, class: "form-control", readonly: "" %>
     <br>
     <%= f.label :language, t("settings.account.language"), class: "form-label" %>
-    <%= f.select :language, language_options, {}, { class: "form-control custom-select" } %>
+    <select id="language-dropdown" class="selectpicker show-tick w-50">
+      <% language_options.each do |lang| %>
+        <option value="<%=lang[1]%>" <%= 'selected' if lang[1] == @user.language %>><%= lang[0] %></option>
+      <% end %>
+    </select>
+    <%= f.hidden_field :language, id: "user_language", value: @user.language %>
+
 
     <%= f.label :roles, t("settings.account.roles"), class: "form-label mt-5" %>
     <% if current_user.role.get_permission("can_manage_users") %>