diff --git a/Cartfile b/Cartfile
index ac2f9392..b73e3cfe 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,3 +1,3 @@
 github "sparkle-project/Sparkle" ~> 1.18.1
-github "mstarke/KeePassKit" ~> 1.4.1
+github "MacPass/KeePassKit" ~> 1.5
 github "mstarke/HNHUi" ~> 1.4.1
diff --git a/Cartfile.resolved b/Cartfile.resolved
index 7258e2f1..2870787e 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,3 +1,3 @@
+github "MacPass/KeePassKit" "1.5"
 github "mstarke/HNHUi" "1.4.1"
-github "mstarke/KeePassKit" "1.4.1"
 github "sparkle-project/Sparkle" "1.18.1"
diff --git a/MacPass/MPCustomFieldTableViewDelegate.m b/MacPass/MPCustomFieldTableViewDelegate.m
index fad4093b..f68519c2 100644
--- a/MacPass/MPCustomFieldTableViewDelegate.m
+++ b/MacPass/MPCustomFieldTableViewDelegate.m
@@ -23,7 +23,7 @@
 #import "MPCustomFieldTableViewDelegate.h"
 #import "MPCustomFieldTableCellView.h"
 #import "MPEntryInspectorViewController.h"
-
+#import "HNHUi/HNHUi.h"
 #import "KeePassKit/KeePassKit.h"
 
 @implementation MPCustomFieldTableViewDelegate
@@ -44,6 +44,11 @@
                  withKeyPath:@"objectValue.isProtected"
                      options:nil];
   
+  [view.valueTextField bind:NSStringFromSelector(@selector(showPassword))
+                   toObject:view
+                withKeyPath:@"objectValue.isProtected"
+                    options:@{NSValueTransformerNameBindingOption: NSNegateBooleanTransformerName}];
+  
   
   for(NSControl *control in @[view.labelTextField, view.valueTextField, view.removeButton, view.protectedButton ]) {
     [control bind:NSEnabledBinding