diff --git a/core/admin/assets/vendor.js b/core/admin/assets/vendor.js
index 1d9b0b69..fd43d918 100644
--- a/core/admin/assets/vendor.js
+++ b/core/admin/assets/vendor.js
@@ -15,6 +15,8 @@ import 'admin-lte/plugins/fontawesome-free/css/solid.css';
 import 'admin-lte/build/scss/adminlte.scss';
 import 'admin-lte/plugins/datatables-bs4/css/dataTables.bootstrap4.css';
 import 'admin-lte/plugins/datatables-responsive/css/responsive.bootstrap4.css';
+import 'admin-lte/plugins/bootstrap/js/bootstrap.js';
+import 'admin-lte/build/js/AdminLTE.js';
 import 'admin-lte/build/js/Layout.js';
 import 'admin-lte/build/js/ControlSidebar.js';
 import 'admin-lte/build/js/PushMenu.js';
diff --git a/core/admin/mailu/ui/templates/base.html b/core/admin/mailu/ui/templates/base.html
index b97919f8..89695e50 100644
--- a/core/admin/mailu/ui/templates/base.html
+++ b/core/admin/mailu/ui/templates/base.html
@@ -16,6 +16,16 @@
             <a class="nav-link" data-widget="pushmenu" href="#" role="button"><i class="fas fa-bars"></i></a>
           </li>
         </ul>
+        <ul class="navbar-nav ml-auto">
+          <li class="nav-item dropdown">
+            <a class="nav-link" data-toggle="dropdown" href="#" aria-expanded="false">{{ session['language'] }}</a>
+            <div class="dropdown-menu dropdown-menu-right p-0">
+                {% for language in session['available_languages'] %}
+                    <a class="dropdown-item {% if language == session['language'] %}active{% endif %} " href="{{ url_for('.set_language', language=language) }}">{{ language }}</a>
+                {% endfor %}
+            </div>
+          </li>
+        </ul>
       </nav>
       <aside class="main-sidebar sidebar-dark-primary">
         <a href="{{ config["WEB_ADMIN"] }}" class="brand-link">
diff --git a/core/admin/mailu/utils.py b/core/admin/mailu/utils.py
index 086b69fa..9d88b54a 100644
--- a/core/admin/mailu/utils.py
+++ b/core/admin/mailu/utils.py
@@ -27,16 +27,17 @@ babel = flask_babel.Babel()
 
 @babel.localeselector
 def get_locale():
+    translations = list(map(str, babel.list_translations()))
+    flask.session['available_languages'] = translations
+
     try:
         language = flask.session['language']
     except KeyError:
-        language = None
+        language = flask.request.accept_languages.best_match(translations)
+        flask.session['language'] = language
 
-    if language is not None:
-        return language
+    return language
 
-    translations = list(map(str, babel.list_translations()))
-    return flask.request.accept_languages.best_match(translations)
 
 # Proxy fixer
 class PrefixMiddleware(object):