diff --git a/Tools/sogo-ealarms-notify.m b/Tools/sogo-ealarms-notify.m
index 0e1f281f73..47fe3a3b58 100644
--- a/Tools/sogo-ealarms-notify.m
+++ b/Tools/sogo-ealarms-notify.m
@@ -23,28 +23,29 @@
 #import <Foundation/NSAutoreleasePool.h>
 #import <Foundation/NSUserDefaults.h>
 
+#import <SOGo/SOGoSystemDefaults.h>
+
 #import "SOGoEAlarmsNotifier.h"
 
 int
 main (int argc, char **argv, char **env)
 {
   NSAutoreleasePool *pool;
-  NSUserDefaults *ud;
   SOGoEAlarmsNotifier *notifier;
+  SOGoSystemDefaults *sogoDefaults;
   int rc;
 
   rc = 0;
 
   pool = [NSAutoreleasePool new];
 
-  ud = [NSUserDefaults standardUserDefaults];
-  [ud addSuiteNamed: @"sogod"];
+  sogoDefaults = [SOGoSystemDefaults sharedSystemDefaults];
 
-  if ([ud objectForKey: @"SOGoEnableEMailAlarms"])
+  if ([sogoDefaults objectForKey: @"SOGoEnableEMailAlarms"])
     {
       notifier = [SOGoEAlarmsNotifier new];
       if (![notifier run])
-	rc = -1;
+      rc = -1;
       [notifier release];
     }
   else
diff --git a/Tools/sogo-slapd-sockd.m b/Tools/sogo-slapd-sockd.m
index fd7662be37..300aec4a3c 100644
--- a/Tools/sogo-slapd-sockd.m
+++ b/Tools/sogo-slapd-sockd.m
@@ -23,13 +23,14 @@
 #import <Foundation/NSAutoreleasePool.h>
 #import <Foundation/NSUserDefaults.h>
 
+#import <SOGo/SOGoSystemDefaults.h>
+
 #import "SOGoSockD.h"
 
 int
 main (int argc, char **argv, char **env)
 {
   NSAutoreleasePool *pool;
-  NSUserDefaults *ud;
   SOGoSockD *sockd;
   int rc;
 
@@ -37,8 +38,7 @@
 
   pool = [NSAutoreleasePool new];
 
-  ud = [NSUserDefaults standardUserDefaults];
-  [ud addSuiteNamed: @"sogod"];
+  [SOGoSystemDefaults sharedSystemDefaults];
 
   sockd = [SOGoSockD new];
   if ([sockd run])