diff --git a/OpenChange/MAPIStoreContext.m b/OpenChange/MAPIStoreContext.m
index 17907e93b..1817658ea 100644
--- a/OpenChange/MAPIStoreContext.m
+++ b/OpenChange/MAPIStoreContext.m
@@ -294,9 +294,11 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
               [MAPIStoreUserContext userContextWithUsername: username
                                              andTDBIndexing: indexingTdb]);
 
+#if 0
       mapistore_mgmt_backend_register_user (newConnInfo,
                                             "SOGo",
                                             [username UTF8String]);
+#endif
 
       connInfo = newConnInfo;
       username = [NSString stringWithUTF8String: newConnInfo->username];
@@ -315,9 +317,12 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
 
 - (void) dealloc
 {
+#if 0
   mapistore_mgmt_backend_unregister_user ([self connectionInfo], "SOGo", 
                                           [[userContext username]
                                             UTF8String]);
+#endif
+
   [contextUrl release];
   [userContext release];
   [containersBag release];
diff --git a/Version b/Version
index 0de612ba1..09503ebca 100644
--- a/Version
+++ b/Version
@@ -2,6 +2,6 @@
 # This file is included by library makefiles to set the version information
 # of the executable.
 
-MAJOR_VERSION=1
-MINOR_VERSION=3
-SUBMINOR_VERSION=17
+MAJOR_VERSION=2
+MINOR_VERSION=0
+SUBMINOR_VERSION=0