diff --git a/modules/core/templates/loginuserpass.twig b/modules/core/templates/loginuserpass.twig
index 07fec8577d9d308bd8ad6db17dae4b3d0ef79d39..ded4fec7fa9d811d1845b3426607b4cc0d4cf076 100644
--- a/modules/core/templates/loginuserpass.twig
+++ b/modules/core/templates/loginuserpass.twig
@@ -76,7 +76,7 @@
                 <div class="pure-control-group">
                     <label for="organization">{{ 'Organization'|trans }}</label>
                     <div class="pure-select right pure-input-1-2 pure-input-sm-1-1">
-                        <select name="organization" class="" id="organization" tabindex="3">
+                        <select name="organization" id="organization" tabindex="3">
                             {{ selectedOrg ?: null }}
                             {%- for id, orgDesc in organizations -%}
                                 {% if id == selectedOrg -%}
diff --git a/src/js/bundle.js b/src/js/bundle.js
index 26610f8e62c9ea5fd17c5f9641d01c204688a934..2025d3916a02d726f130f9bab855ca037a2ab9a3 100644
--- a/src/js/bundle.js
+++ b/src/js/bundle.js
@@ -6,6 +6,10 @@ import php from "highlight.js/lib/languages/php";
 import json from "highlight.js/lib/languages/json";
 
 $(document).ready(function () {
+    $('#language-selector').on('change', function () {
+        $("#language-form").submit();
+    });
+
     // side menu
     $('#menuLink').click(function (e) {
         e.preventDefault();
diff --git a/templates/_header.twig b/templates/_header.twig
index 9b241bf4c6bf05d7732a0a72c31a754502f2c1f6..f3533434be8198110f8a6a7860a9f53f0fbbfe69 100644
--- a/templates/_header.twig
+++ b/templates/_header.twig
@@ -55,7 +55,7 @@
             <input type="hidden" name="{{ name }}">
               {% endif %}
             {% endfor %}
-            <select  class="pure-input-1-4 language-menu" name="language" id="language-selector">
+            <select aria-label="{% trans %}Language{% endtrans %}" class="pure-input-1-4 language-menu" name="language" id="language-selector">
             {% for key, lang in languageBar %}
               {% if key == currentLanguage %}
               <option value="{{ key }}" selected="selected">&#xf0ac;  {{ lang.name }}</option>