diff --git a/ChangeLog b/ChangeLog
index 8e700c087..cd95dc7d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-13	Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+	* Fixed bug #1942. We now set the app name to "SOGo"
+	for the Samba/OpenChange application so wox are properly
+	found by SOPE.
+
 2012-09-12  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* OpenChange/MAPIStoreTasksMessage.m: added a way to get
diff --git a/OpenChange/MAPIApplication.m b/OpenChange/MAPIApplication.m
index b4ad58073..47438c2b1 100644
--- a/OpenChange/MAPIApplication.m
+++ b/OpenChange/MAPIApplication.m
@@ -43,6 +43,11 @@ MAPIApplication *MAPIApp = nil;
   return NO;
 }
 
+- (NSString *) name
+{
+  return @"SOGo";
+}
+
 - (id) init
 {
   if (!MAPIApp)
diff --git a/OpenChange/MAPIStoreCalendarMessage.m b/OpenChange/MAPIStoreCalendarMessage.m
index afdbb98b0..ce53719ed 100644
--- a/OpenChange/MAPIStoreCalendarMessage.m
+++ b/OpenChange/MAPIStoreCalendarMessage.m
@@ -648,6 +648,7 @@ static Class NSArrayK;
                           inUserContext: [self userContext]
                          withActiveUser: activeUser];
   [self _updateAttachedEvents];
+  [[self userContext] activateWithUser: activeUser];
   [sogoObject updateContentWithCalendar: calendar
                             fromRequest: nil];