diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m index 1754b10b0..e7506182f 100644 --- a/UI/Common/UIxPageFrame.m +++ b/UI/Common/UIxPageFrame.m @@ -466,8 +466,12 @@ - (NSString *) userIdentification { + NSString *v; + /* The "identification" term is used in the human sense here. */ - return [[context activeUser] cn]; + v = [[context activeUser] cn]; + + return (v ? v : @""); } - (NSString *) userEmail diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m index 0ab260b8f..c4606f13f 100644 --- a/UI/SOGoUI/UIxComponent.m +++ b/UI/SOGoUI/UIxComponent.m @@ -364,6 +364,9 @@ static SoProduct *commonProduct = nil; baseURL = [[self clientObject] baseURLInContext: context]; + if (!baseURL) + baseURL = @"/SOGo/so/"; + if ([baseURL hasSuffix: [NSString stringWithFormat: @"%@/", [[self parent] modulePath]]]) return baseURL;