diff --git a/authentik/brands/middleware.py b/authentik/brands/middleware.py index 52af854e33..dd72038ab8 100644 --- a/authentik/brands/middleware.py +++ b/authentik/brands/middleware.py @@ -25,5 +25,7 @@ class BrandMiddleware: locale = brand.default_locale if locale != "": locale_to_set = locale - with override(locale_to_set): - return self.get_response(request) + if locale_to_set: + with override(locale_to_set): + return self.get_response(request) + return self.get_response(request) diff --git a/authentik/core/middleware.py b/authentik/core/middleware.py index 1d20455a1b..811b1eceb2 100644 --- a/authentik/core/middleware.py +++ b/authentik/core/middleware.py @@ -42,8 +42,10 @@ class ImpersonateMiddleware: # Ensure that the user is active, otherwise nothing will work request.user.is_active = True - with override(locale_to_set): - return self.get_response(request) + if locale_to_set: + with override(locale_to_set): + return self.get_response(request) + return self.get_response(request) class RequestIDMiddleware: