diff --git a/ChangeLog b/ChangeLog
index 34f49283a..0d92c03af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-18  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SOGoDAVAuthenticator.m (-checkLogin:andPassword:)
+	(imapPasswordInContext:forServer:forceRenew:): when using CAS
+	authentication, make use of the password as a CAS ticket instead
+	of as identifier, since we don't make use of those in DAV.
+
 2010-06-17  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/UIxMailToSelection.js
diff --git a/SoObjects/SOGo/SOGoDAVAuthenticator.m b/SoObjects/SOGo/SOGoDAVAuthenticator.m
index 264011e27..be9ee902e 100644
--- a/SoObjects/SOGo/SOGoDAVAuthenticator.m
+++ b/SoObjects/SOGo/SOGoDAVAuthenticator.m
@@ -70,8 +70,8 @@
       if ([[sd davAuthenticationType] isEqualToString: @"cas"])
         {
           /* CAS authentication for DAV requires using a proxy */
-          session = [SOGoCASSession CASSessionWithIdentifier: _pwd
-                                                   fromProxy: YES];
+          session = [SOGoCASSession CASSessionWithTicket: _pwd
+                                               fromProxy: YES];
           if (session)
             rc = [[session login] isEqualToString: _login];
         }
@@ -111,8 +111,8 @@
       sd = [SOGoSystemDefaults sharedSystemDefaults];
       if ([[sd davAuthenticationType] isEqualToString: @"cas"])
         {
-          session = [SOGoCASSession CASSessionWithIdentifier: password
-                                                   fromProxy: YES];
+          session = [SOGoCASSession CASSessionWithTicket: password
+                                               fromProxy: YES];
           service = [NSString stringWithFormat: @"imap://%@", imapServer];
           if (renew)
             [session invalidateTicketForService: service];