diff --git a/ChangeLog b/ChangeLog
index 249b121df..7fc2af927 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-08-21  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/SOGoUI/UIxComponent.m ([UIxComponent -labelForKey:]): use
+	[self pageResourceManager] instead of [self resourceManager].
+
 	* UI/Contacts/UIxContactEditorBase.m: invokes
 	globallyUniqueObjectId on the clientobject's class instead of the
 	hardcoded "SOGoFolder".
diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m
index 2e7a8d941..203bdf1d6 100644
--- a/UI/SOGoUI/UIxComponent.m
+++ b/UI/SOGoUI/UIxComponent.m
@@ -402,7 +402,7 @@ static BOOL uixDebugEnabled = NO;
     
   /* find resource manager */
     
-  if ((rm = [self resourceManager]) == nil)
+  if ((rm = [self pageResourceManager]) == nil)
     rm = [[WOApplication application] resourceManager];
   if (rm == nil)
     [self warnWithFormat:@"missing resource manager!"];