diff --git a/NEWS b/NEWS
index 10b060422..35ef7881a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,9 @@
 2.2.10 (2014-xx-xx)
 -------------------
 
+Enhancements
+ - no longer leaking database passwords in the logs (#2953)
+
 Bug fixes
  - fixed freebusy lookup with "Show time as busy" (#2930)
  - don't escape <br>'s in a card's note field
@@ -21,7 +24,7 @@ New features
  - support for recurrent tasks (#2160)
  - support for alarms on recurrent events / tasks
 
-Enchancements
+Enhancements
  - alarms can now be snoozed for 1 day
  - better iOS/Mac OS X Calendar compability regarding alarms (#1920)
  - force default classification over CalDAV if none is set (#2326)
@@ -46,7 +49,7 @@ New features
  - new user settings for threads collapsing
  - IMAP global search support (#2670)
 
-Enchancements
+Enhancements
  - major refactoring of the GCS component saving code (dropped OGoContentStore)
  - printing calendars in colors is now possible in all views; list, daily, weekly and multicolumns
  - new option to print calendars events and tasks with a background color or with a border color
diff --git a/SOPE/GDLContentStore/GCSChannelManager.m b/SOPE/GDLContentStore/GCSChannelManager.m
index 62a395e71..b21b230a6 100644
--- a/SOPE/GDLContentStore/GCSChannelManager.m
+++ b/SOPE/GDLContentStore/GCSChannelManager.m
@@ -276,7 +276,7 @@ static NSTimeInterval ChannelCollectionTimer = 5 * 60;
   EOAdaptorChannel *channel;
   GCSChannelHandle *handle;
   NSCalendarDate *now, *lastFailure;
-  NSString *urlId;
+  NSString *urlId, *url;
 
   channel = nil;
   urlId = [_url gcsURLId];
@@ -304,10 +304,10 @@ static NSTimeInterval ChannelCollectionTimer = 5 * 60;
         }
       else
         {
+          url = [NSString stringWithFormat: @"%@://%@%@", [_url scheme], [_url host], [_url path]];
           if (debugPools)
             {
-              [self logWithFormat: @"DBPOOL: create new DB channel for URL: %@",
-                    [_url absoluteString]];
+              [self logWithFormat: @"DBPOOL: create new DB channel for %@", url];
             }
 
           /* create channel */
@@ -330,15 +330,13 @@ static NSTimeInterval ChannelCollectionTimer = 5 * 60;
 
                   if (lastFailure)
                     {
-                      [self logWithFormat: @"db for %@ is now back up",
-                            [_url absoluteString]];
+                      [self logWithFormat: @"db for %@ is now back up", url];
                       [lastFailures removeObjectForKey: urlId];
                     }
                 }
               else
                 {
-                  [self errorWithFormat: @"could not open channel %@ for URL: %@",
-                        channel, [_url absoluteString]];
+                  [self errorWithFormat: @"could not open channel %@ for %@", channel, url];
                   channel = nil;
                   [lastFailures setObject: now forKey: urlId];
                   [self warnWithFormat: @"  will prevent opening of this"