diff --git a/MacPass/MPDatabaseDocument.m b/MacPass/MPDatabaseDocument.m
index 1563adb5..10043dc6 100644
--- a/MacPass/MPDatabaseDocument.m
+++ b/MacPass/MPDatabaseDocument.m
@@ -125,23 +125,8 @@ NSString *const MPDidLoadDatabaseNotification = @"DidLoadDataBaseNotification";
   return NO;
 }
 
-- (KdbPassword *)passwordHash {
-  
-  // Create the password for the given parameters
-  if( self.password && self.key) {
-    return [[[KdbPassword alloc] initWithPassword:self.password encoding:NSUTF8StringEncoding keyfile:[self.key path]] autorelease];
-  }
-  
-  if( self.password ) {
-    return [[[KdbPassword alloc] initWithPassword:self.password encoding:NSUTF8StringEncoding] autorelease];
-  }
-  
-  if( self.key ) {
-    return [[[KdbPassword alloc] initWithKeyfile:[self.key path]] autorelease];
-  }
-  
-  NSLog(@"Error: No password or keyfile given!");
-  return nil;
+- (KdbPassword *)passwordHash {  
+  return [[KdbPassword alloc] initWithPassword:self.password passwordEncoding:NSUTF8StringEncoding keyFile:[self.key path]];
 }
 
 @end
diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist
index 8ba7b313..94f35a26 100644
--- a/MacPass/MacPass-Info.plist
+++ b/MacPass/MacPass-Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>41B</string>
+	<string>421</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/MiniKeePassLib b/MiniKeePassLib
index 681d0518..22bc8fcc 160000
--- a/MiniKeePassLib
+++ b/MiniKeePassLib
@@ -1 +1 @@
-Subproject commit 681d0518879ad306ae5a286aeb5fee83a7ac2c8e
+Subproject commit 22bc8fcc488c76dc375bb22730f3f0c4a64813ad