diff --git a/core/admin/mailu/sso/templates/base_sso.html b/core/admin/mailu/sso/templates/base_sso.html
index 913a806f..2d6446b2 100644
--- a/core/admin/mailu/sso/templates/base_sso.html
+++ b/core/admin/mailu/sso/templates/base_sso.html
@@ -38,7 +38,7 @@
               <span class="badge badge-primary navbar-badge">{{ session['language'] }}</span></a>
             <div class="dropdown-menu dropdown-menu-right p-0" id="mailu-languages">
             {%- for locale in config.translations.values() %}
-              <a class="dropdown-item{% if locale.language == session['language'] %} active{% endif %}" href="{{ url_for('ui.set_language', language=locale.language) }}">{{ locale.get_language_name().title() }}</a>
+              <a class="dropdown-item{% if locale.language == session['language'] %} active{% endif %}" href="{{ url_for('sso.set_language', language=locale.language) }}">{{ locale.get_language_name().title() }}</a>
             {%- endfor %}
             </div>
           </li>
diff --git a/core/admin/mailu/sso/views/__init__.py b/core/admin/mailu/sso/views/__init__.py
index 990c7919..7b1830fb 100644
--- a/core/admin/mailu/sso/views/__init__.py
+++ b/core/admin/mailu/sso/views/__init__.py
@@ -1,3 +1,3 @@
 __all__ = [
-    'base'
+    'base', 'languages'
 ]
diff --git a/core/admin/mailu/sso/views/languages.py b/core/admin/mailu/sso/views/languages.py
new file mode 100644
index 00000000..a723193a
--- /dev/null
+++ b/core/admin/mailu/sso/views/languages.py
@@ -0,0 +1,9 @@
+from mailu.sso import sso, forms
+from mailu.ui import access
+
+import flask
+
+@sso.route('/language/<language>', methods=['POST'])
+def set_language(language=None):
+    flask.session['language'] = language
+    return flask.Response(status=200)
diff --git a/core/nginx/conf/nginx.conf b/core/nginx/conf/nginx.conf
index e439e0e1..13317d76 100644
--- a/core/nginx/conf/nginx.conf
+++ b/core/nginx/conf/nginx.conf
@@ -134,11 +134,6 @@ http {
         proxy_pass http://$admin;
       }
 
-      location ^~ /ui/language {
-        include /etc/nginx/proxy.conf;
-        proxy_pass http://$admin;
-      }
-
       location ^~ /static {
         include /etc/nginx/proxy.conf;
         rewrite ^/static/(.*) /static/static/$1 break;