diff --git a/ChangeLog b/ChangeLog
index 62760f988..23c5c9735 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
         * SoObject/SOGo/SQLSource.m - added SHA password
 	hash support for SQL authentication sources.
+	* Added patch from bug #1048
 
 2010-12-08  Francis Lachapelle  <flachapelle@inverse.ca>
 
diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m
index fe2985968..9a4c52564 100644
--- a/UI/Common/UIxPageFrame.m
+++ b/UI/Common/UIxPageFrame.m
@@ -458,9 +458,10 @@
   if ([auth respondsToSelector: @selector (cookieNameInContext:)])
     {
       sd = [SOGoSystemDefaults sharedSystemDefaults];
-      canLogoff = (([[sd authenticationType] isEqualToString: @"cas"]
-                    && [sd CASLogoutEnabled])
-                   || [[auth cookieNameInContext: context] length] > 0);
+      if ([[sd authenticationType] isEqualToString: @"cas"])
+	canLogoff = [sd CASLogoutEnabled];
+      else
+	canLogoff = [[auth cookieNameInContext: context] length] > 0;
     }
   else
     canLogoff = NO;