diff --git a/ChangeLog b/ChangeLog
index 9cb1cbd9e..db7664943 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-11-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/WebServerResources/generic.js (triggerAjaxRequest): invoke
+	the request callback only when set on the http object.
+
 	* SoObjects/Mailer/SOGoMailBaseObject.m (-_createIMAP4Connection):
 	we need to initialize newConnection to nil when the return
 	password is nil.
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index f8c7eca44..6561709a8 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -287,7 +287,7 @@ function onAjaxRequestStateChange(http) {
                 createCASRecoveryIFrame(http);
             }
             else if (activeAjaxRequests > 0) {
-                if (!http.aborted)
+                if (!http.aborted && http.callback)
                     http.callback(http);
                 activeAjaxRequests--;
                 checkAjaxRequestsState();