diff --git a/cps/templates/search_form.html b/cps/templates/search_form.html
index f5483139..5d186ba7 100644
--- a/cps/templates/search_form.html
+++ b/cps/templates/search_form.html
@@ -228,10 +228,6 @@
 {% endblock %}
 
 {% block js %}
-<script>
-  var language = '{{ g.user.locale }}';
-</script>
-
 <script src="{{ url_for('static', filename='js/libs/bootstrap-datepicker/bootstrap-datepicker.min.js') }}"></script>
 {% if not g.user.locale == 'en' %}
 <script src="{{ url_for('static', filename='js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.' + g.user.locale + '.min.js') }}" charset="UTF-8"></script>
diff --git a/cps/templates/tasks.html b/cps/templates/tasks.html
index c13ddff9..40120335 100644
--- a/cps/templates/tasks.html
+++ b/cps/templates/tasks.html
@@ -26,8 +26,5 @@
 {% block js %}
 <script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table.min.js') }}"></script>
 <script src="{{ url_for('static', filename='js/table.js') }}"></script>
-<script>
-    // ToDo: Move to js file
-</script>
 
 {% endblock %}
diff --git a/cps/templates/user_table.html b/cps/templates/user_table.html
index dec79eb0..111d2a09 100644
--- a/cps/templates/user_table.html
+++ b/cps/templates/user_table.html
@@ -183,6 +183,9 @@
 <script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table-editable.min.js') }}"></script>
 <script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-editable.min.js') }}"></script>
 <script src="{{ url_for('static', filename='js/libs/bootstrap-select.min.js')}}"></script>
+{% if not g.user.locale == 'en' %}
+<script src="{{ url_for('static', filename='js/libs/bootstrap-select/defaults-' + g.user.locale + '.min.js') }}" charset="UTF-8"></script>
+{% endif %}
 <script src="{{ url_for('static', filename='js/table.js') }}"></script>
 {% endblock %}