diff --git a/Cartfile.resolved b/Cartfile.resolved
index 708dfce7d..4895812e9 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,4 +1,4 @@
-git "file:///Users/michael/Projekte/GitHub/KeePassKit" "8683494affd36763d8cfe0eb762c9eb330a1da17"
+git "file:///Users/michael/Projekte/GitHub/KeePassKit" "4e928213b2ef3a07dcf0b5d9440459f119f9d2f5"
 github "mstarke/HNHUi" "3.0"
 github "robbiehanson/KissXML" "5.3.1"
 github "sparkle-project/Sparkle" "v1.23.0"
diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index 82615cb76..4903a3063 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -226,6 +226,8 @@
 		4CA78C001FD58C92003C8560 /* MPPluginRepository.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA78BFF1FD58C92003C8560 /* MPPluginRepository.m */; };
 		4CAAA8271D787B8B00CDE977 /* MPAutotypeBuilderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAAA8251D787B8B00CDE977 /* MPAutotypeBuilderViewController.m */; };
 		4CAD338F205169D30068587E /* MPPluginRepositoryItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD338E205169D30068587E /* MPPluginRepositoryItem.m */; };
+		4CAD45312519E99E00D0D788 /* KissXML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CAD45302519E99E00D0D788 /* KissXML.framework */; };
+		4CAD45322519E9A900D0D788 /* KissXML.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4CAD45302519E99E00D0D788 /* KissXML.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		4CAD748C15B889B700104512 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CAD748B15B889B700104512 /* Security.framework */; };
 		4CAD748E15B88AC100104512 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CAD748D15B88AC100104512 /* libz.dylib */; };
 		4CAD8AA622CF397B0090B2DD /* MPAutotypeDoctorReportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD8AA422CF397B0090B2DD /* MPAutotypeDoctorReportViewController.m */; };
@@ -308,6 +310,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				4CAD45322519E9A900D0D788 /* KissXML.framework in CopyFiles */,
 				4CD60C131C104AD4005BE5F8 /* HNHUi.framework in CopyFiles */,
 				4C7B637F1C0CB57300D7038C /* KeePassKit.framework in CopyFiles */,
 				4C7B63801C0CB57300D7038C /* Sparkle.framework in CopyFiles */,
@@ -771,6 +774,7 @@
 		4CAAA8251D787B8B00CDE977 /* MPAutotypeBuilderViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAutotypeBuilderViewController.m; sourceTree = "<group>"; };
 		4CAD338D205169D30068587E /* MPPluginRepositoryItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPPluginRepositoryItem.h; sourceTree = "<group>"; };
 		4CAD338E205169D30068587E /* MPPluginRepositoryItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPPluginRepositoryItem.m; sourceTree = "<group>"; };
+		4CAD45302519E99E00D0D788 /* KissXML.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = KissXML.framework; path = Carthage/Build/Mac/KissXML.framework; sourceTree = "<group>"; };
 		4CAD748B15B889B700104512 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
 		4CAD748D15B88AC100104512 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		4CAD8AA322CF397B0090B2DD /* MPAutotypeDoctorReportViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPAutotypeDoctorReportViewController.h; sourceTree = "<group>"; };
@@ -1092,6 +1096,7 @@
 				4C7B637C1C0CB55600D7038C /* KeePassKit.framework in Frameworks */,
 				4CAD748C15B889B700104512 /* Security.framework in Frameworks */,
 				4CBC5DDD23C61C8900D14B92 /* TransformerKit.framework in Frameworks */,
+				4CAD45312519E99E00D0D788 /* KissXML.framework in Frameworks */,
 				4C77E36715B84A240093A587 /* Cocoa.framework in Frameworks */,
 				4C7B637D1C0CB55600D7038C /* Sparkle.framework in Frameworks */,
 				4CC281891C0F675B00B9174D /* HNHUi.framework in Frameworks */,
@@ -1482,6 +1487,7 @@
 				4CBC5DDB23C61C8300D14B92 /* TransformerKit.framework */,
 				4CC281881C0F675B00B9174D /* HNHUi.framework */,
 				4C7B63791C0CB55600D7038C /* KeePassKit.framework */,
+				4CAD45302519E99E00D0D788 /* KissXML.framework */,
 				4C7B637A1C0CB55600D7038C /* Sparkle.framework */,
 				4C00E33917D8FA3B00F37192 /* DDHotKey */,
 				4C77E36C15B84A240093A587 /* MacPass */,
diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m
index 1d278774f..ba5a2f41c 100644
--- a/MacPass/MPDocument.m
+++ b/MacPass/MPDocument.m
@@ -955,7 +955,7 @@ - (void)_storeKeyURL:(NSURL *)keyURL {
     /* user has removed the keyfile or we should not safe it so remove it */
     [keysForFiles removeObjectForKey:self.fileURL.path.sha1HexDigest];
   }
-  else if(self.compositeKey.hasPassword && self.compositeKey.hasKeyFile) {
+  else if([self.compositeKey hasKeyOfClass:KPKPasswordKey.class] && [self.compositeKey hasKeyOfClass:KPKFileKey.class]) {
     if(nil == keysForFiles) {
       keysForFiles = [[NSMutableDictionary alloc] initWithCapacity:1];
     }
diff --git a/MacPass/MPPasswordEditWindowController.m b/MacPass/MPPasswordEditWindowController.m
index b3ea19265..07d2ed7a7 100644
--- a/MacPass/MPPasswordEditWindowController.m
+++ b/MacPass/MPPasswordEditWindowController.m
@@ -56,7 +56,7 @@ - (void)windowDidLoad {
   [self.togglePasswordButton bind:NSValueBinding toObject:self withKeyPath:NSStringFromSelector(@selector(showPassword)) options:nil];
   self.window.defaultButtonCell = self.changePasswordButton.cell;
   MPDocument *document = self.document;
-  self.enablePassword = document.compositeKey.hasPassword;
+  self.enablePassword = [document.compositeKey hasKeyOfClass:KPKPasswordKey.class];
 }
 
 - (void)updateView {