diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m
index 2871e07af..1b60cc72c 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher.m
+++ b/ActiveSync/SOGoActiveSyncDispatcher.m
@@ -3258,7 +3258,7 @@ void handle_eas_terminate(int signum)
   NSException *error;
   NSString *from;
 
-  authenticator = [SOGoDAVAuthenticator sharedSOGoDAVAuthenticator];
+  authenticator = [[context activeUser] authenticatorInContext: context];
   dd = [[context activeUser] domainDefaults];
   
   // We generate the Sender