diff --git a/Main/SOGo.m b/Main/SOGo.m
index 606da8ba9..a0f93f2cc 100644
--- a/Main/SOGo.m
+++ b/Main/SOGo.m
@@ -374,8 +374,10 @@ static BOOL debugLeaks;
 
   request = [_ctx request];
   login = [SOGoUser getDecryptedUsernameIfNeeded: _key request: request];
-
-  user = [SOGoUser userWithLogin: login roles: nil];
+  if([login isEqualToString: @"changeLanguage"])
+    user = nil;
+  else
+    user = [SOGoUser userWithLogin: login roles: nil];
   if (user)
     userFolder = [$(@"SOGoUserFolder") objectWithName: login
                                           inContainer: self];
diff --git a/UI/WebServerResources/js/Main/Main.app.js b/UI/WebServerResources/js/Main/Main.app.js
index e1dca17e7..04bb927dd 100644
--- a/UI/WebServerResources/js/Main/Main.app.js
+++ b/UI/WebServerResources/js/Main/Main.app.js
@@ -198,7 +198,7 @@
 
     this.changeLanguage = function ($event) {
       // Reload page
-      $window.location.href = ApplicationBaseURL + 'login?language=' + this.creds.language;
+      $window.location.href = ApplicationBaseURL + 'changeLanguage?language=' + this.creds.language;
     };
 
     this.canChangePassword = function (form) {