diff --git a/ChangeLog b/ChangeLog
index cc7dac5c9..1a65ad0c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,12 @@
 
 2009-03-24  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* SoObjects/SOGo/SOGoUser.m ([SOGoUser -invalidateLanguage]):
+	new method to invalidate the language ivar.	
+
+	* UI/MainUI/SOGoRootPage.m ([SOGoRootPage -connectAction]): must
+	invalidate user's language ivar when it changes.
+
 	* SoObjects/Appointments/SOGoCalendarComponent.m
 	([SOGoCalendarComponent
 	-sendEMailUsingTemplateNamed:forObject:previousObject:toAttendees:]):
diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index f725e525a..3d242f247 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -548,6 +548,11 @@ _timeValue (NSString *key)
   return (NSUserDefaults *) settings;
 }
 
+- (void) invalidateLanguage
+{
+  language = nil;
+}
+
 - (NSString *) language
 {
   if (![language length])
diff --git a/UI/MainUI/SOGoRootPage.m b/UI/MainUI/SOGoRootPage.m
index 6ba80cf68..914abbf74 100644
--- a/UI/MainUI/SOGoRootPage.m
+++ b/UI/MainUI/SOGoRootPage.m
@@ -96,6 +96,7 @@ static NSArray *supportedLanguages = nil;
 	  user = [SOGoUser userWithLogin: userName roles: nil];
 	  [[user userDefaults] setObject: language forKey: @"Language"];
 	  [[user userDefaults] synchronize];
+	  [user invalidateLanguage];
 	}
     }
   else