diff --git a/KeePassKit b/KeePassKit
index 4206bb55..0e022068 160000
--- a/KeePassKit
+++ b/KeePassKit
@@ -1 +1 @@
-Subproject commit 4206bb552005f1fddddebcb1a66f6679556e5c27
+Subproject commit 0e02206885ce0bff65ca683e17e7f64129e63916
diff --git a/MacPass/MPServerDaemon.m b/MacPass/MPServerDaemon.m
index 168eff6e..f0f0db99 100644
--- a/MacPass/MPServerDaemon.m
+++ b/MacPass/MPServerDaemon.m
@@ -30,10 +30,10 @@
   self = [super init];
   if (self) {
     NSUserDefaultsController *defaultsController = [NSUserDefaultsController sharedUserDefaultsController];
-    NSString *enableServerKeyPath = [NSString stringWithFormat:@"values.%@", kMPSettingsKeyEnableHttpServer];
-    NSString *showItemKeyPath = [NSString stringWithFormat:@"values.%@", kMPSettingsKeyShowMenuItem];
-    [self bind:@"isEnabled" toObject:defaultsController withKeyPath:enableServerKeyPath options:nil];
-    [self bind:@"showStatusItem" toObject:defaultsController withKeyPath:showItemKeyPath options:nil];
+    NSString *enableServerKeyPath = [MPSettingsHelper defaultControllerPathForKey:kMPSettingsKeyEnableHttpServer];
+    NSString *showItemKeyPath = [MPSettingsHelper defaultControllerPathForKey:kMPSettingsKeyShowMenuItem];
+    [self bind:NSStringFromSelector(@selector(isEnabled)) toObject:defaultsController withKeyPath:enableServerKeyPath options:nil];
+    [self bind:NSStringFromSelector(@selector(showStatusItem)) toObject:defaultsController withKeyPath:showItemKeyPath options:nil];
   }
   return self;
 }