diff --git a/ChangeLog b/ChangeLog
index 73092666f..d23d7bad3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-10-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Common/UIxPageFrame.m ([UIxPageFrame -commonLocalizableStrings])
+	([UIxPageFrame -productLocalizableStrings]): invoke the new
+	+[SOGoUser language] method if the user is nil.
+
 	* SoObjects/SOGo/SOGoUser.m ([SOGoUser +language]): new method
 	that returns any generically-found language.
 	([SoUser -language]): modified to call the above.
diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m
index 447572b0b..efda984ef 100644
--- a/UI/Common/UIxPageFrame.m
+++ b/UI/Common/UIxPageFrame.m
@@ -179,6 +179,9 @@
   frameworkName = [NSString stringWithFormat: @"%@.SOGo",
 			    (framework ? framework : [self frameworkName])];
   language = [[context activeUser] language];
+  if (!language)
+    language = [SOGoUser language];
+
   table
     = [[self resourceManager] stringTableWithName: @"Localizable"
 			      inFramework: frameworkName