diff --git a/templates/base.twig b/templates/base.twig
index 6415fda2a790eb94fdce7735dd362edec1ba76ee..ccbba8599727d5dce7e5f9b15158f58f276eca99 100644
--- a/templates/base.twig
+++ b/templates/base.twig
@@ -45,7 +45,6 @@
 
 
     <!-- postload javascript -->
-    <script type="text/javascript" src="/{{ baseurlpath }}assets/js/src/script.js"></script>
     {% if jquery %}
     {% set version = '1.8' %}
     {% if jquery.version %}
@@ -66,5 +65,6 @@
     <script type="text/javascript" src="/{{ baseurlpath }}assets/js/lib/jquery-3.2.1.min.js"></script>
     <script type="text/javascript" src="/{{ baseurlpath }}assets/js/lib/selectize.min.js"></script>
     <script type="text/javascript" src="/{{ baseurlpath }}assets/js/src/language.js"></script>
+    <script type="text/javascript" src="/{{ baseurlpath }}assets/js/src/script.js"></script>
     {% block postload %}{% endblock %}
 </body></html>
diff --git a/www/assets/js/src/language.js b/www/assets/js/src/language.js
index 2b04d6c47a4927e1f147e63816073c94284e541b..9150e4354e8da1c06b676e3f9c2db77e50a72085 100644
--- a/www/assets/js/src/language.js
+++ b/www/assets/js/src/language.js
@@ -15,7 +15,4 @@ $(document).ready(function() {
         }
     });
 
-    $('.language-menu').selectize();
-    $('.language-menu-small').selectize();
-
 });
diff --git a/www/assets/js/src/script.js b/www/assets/js/src/script.js
index 3adf1b1f88e7573cc37c8dad40769a5e5fac264b..7364bdaa38e19416ee8711a433fa78b366b30309 100644
--- a/www/assets/js/src/script.js
+++ b/www/assets/js/src/script.js
@@ -39,3 +39,8 @@ function SimpleSAML_hide(id) {
 
   element.style.display = 'none';
 }
+
+$(document).ready(function() {
+    $('.language-menu').selectize();
+    $('#organization').selectize();
+});
\ No newline at end of file