diff --git a/ChangeLog b/ChangeLog
index afe7ab390..512a008f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-06-16  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreSOGo.m (mapistore_init_backend): accept
+	double registration seamlessly.
+
 	* SoObjects/Mailer/SOGoMailObject.m (-displayName): make use of
 	the decoded subject.
 
diff --git a/OpenChange/MAPIStoreSOGo.m b/OpenChange/MAPIStoreSOGo.m
index d5946af69..e782d15c1 100644
--- a/OpenChange/MAPIStoreSOGo.m
+++ b/OpenChange/MAPIStoreSOGo.m
@@ -1210,12 +1210,10 @@ int mapistore_init_backend(void)
 {
   struct mapistore_backend	backend;
   int				ret;
-  static BOOL registered = NO;
+  static BOOL                   registered = NO;
 
   if (registered)
-    {
-      ret = MAPISTORE_ERROR;
-    }
+    ret = MAPISTORE_SUCCESS;
   else
     {
       registered = YES;