diff --git a/HNHUi b/HNHUi
index 5655cb45..260aa47e 160000
--- a/HNHUi
+++ b/HNHUi
@@ -1 +1 @@
-Subproject commit 5655cb45194b9542cf2abf58cad6fb6508c22773
+Subproject commit 260aa47e80c53df5a0648f868482ba767cfd1fc2
diff --git a/MacPass/Base.lproj/InspectorView.xib b/MacPass/Base.lproj/InspectorView.xib
index 4d72c25f..6808ec9f 100644
--- a/MacPass/Base.lproj/InspectorView.xib
+++ b/MacPass/Base.lproj/InspectorView.xib
@@ -20,6 +20,8 @@
 			<string>NSImageView</string>
 			<string>NSScrollView</string>
 			<string>NSScroller</string>
+			<string>NSSecureTextField</string>
+			<string>NSSecureTextFieldCell</string>
 			<string>NSSegmentedCell</string>
 			<string>NSSegmentedControl</string>
 			<string>NSTabView</string>
@@ -200,13 +202,13 @@
 						<string key="NSFrame">{{0, 31}, {293, 399}}</string>
 						<reference key="NSSuperview" ref="87082330"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="292493070"/>
+						<reference key="NSNextKeyView" ref="726109125"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<array class="NSMutableArray" key="NSTabViewItems">
 							<object class="NSTabViewItem" id="1002013291">
 								<string key="NSIdentifier">1</string>
 								<object class="NSView" key="NSView" id="726109125">
-									<nil key="NSNextResponder"/>
+									<reference key="NSNextResponder" ref="166081160"/>
 									<int key="NSvFlags">256</int>
 									<array class="NSMutableArray" key="NSSubviews">
 										<object class="NSTextField" id="734056912">
@@ -214,6 +216,7 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{17, 365}, {35, 14}}</string>
 											<reference key="NSSuperview" ref="726109125"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="909883915"/>
 											<string key="NSReuseIdentifierKey">_NS:1535</string>
 											<bool key="NSEnabled">YES</bool>
@@ -246,6 +249,7 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{20, 335}, {253, 22}}</string>
 											<reference key="NSSuperview" ref="726109125"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="328122838"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<bool key="NSEnabled">YES</bool>
@@ -280,6 +284,7 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{17, 313}, {58, 14}}</string>
 											<reference key="NSSuperview" ref="726109125"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="800408621"/>
 											<string key="NSReuseIdentifierKey">_NS:1535</string>
 											<bool key="NSEnabled">YES</bool>
@@ -300,6 +305,7 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{20, 283}, {253, 22}}</string>
 											<reference key="NSSuperview" ref="726109125"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="428053603"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<bool key="NSEnabled">YES</bool>
@@ -321,6 +327,7 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{20, 231}, {253, 22}}</string>
 											<reference key="NSSuperview" ref="726109125"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="279643156"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<bool key="NSEnabled">YES</bool>
@@ -342,6 +349,7 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{17, 261}, {25, 14}}</string>
 											<reference key="NSSuperview" ref="726109125"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="484293743"/>
 											<string key="NSReuseIdentifierKey">_NS:1535</string>
 											<bool key="NSEnabled">YES</bool>
@@ -362,7 +370,8 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{17, 209}, {58, 14}}</string>
 											<reference key="NSSuperview" ref="726109125"/>
-											<reference key="NSNextKeyView" ref="25956638"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="685310174"/>
 											<string key="NSReuseIdentifierKey">_NS:1535</string>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="265601258">
@@ -377,32 +386,13 @@
 											</object>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
-										<object class="NSTextField" id="25956638">
-											<reference key="NSNextResponder" ref="726109125"/>
-											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{20, 179}, {253, 22}}</string>
-											<reference key="NSSuperview" ref="726109125"/>
-											<reference key="NSNextKeyView" ref="172507372"/>
-											<string key="NSReuseIdentifierKey">_NS:9</string>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSTextFieldCell" key="NSCell" id="255014572">
-												<int key="NSCellFlags">-1804599231</int>
-												<int key="NSCellFlags2">272630784</int>
-												<string key="NSContents"/>
-												<reference key="NSSupport" ref="308723166"/>
-												<string key="NSCellIdentifier">_NS:9</string>
-												<reference key="NSControlView" ref="25956638"/>
-												<bool key="NSDrawsBackground">YES</bool>
-												<reference key="NSBackgroundColor" ref="955209345"/>
-												<reference key="NSTextColor" ref="412903852"/>
-											</object>
-											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-										</object>
 										<object class="NSButton" id="172507372">
 											<reference key="NSNextResponder" ref="726109125"/>
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{20, 152}, {253, 19}}</string>
 											<reference key="NSSuperview" ref="726109125"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="13391205"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<string key="NSHuggingPriority">{250, 750}</string>
 											<bool key="NSEnabled">YES</bool>
@@ -431,6 +421,7 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{17, 35}, {259, 11}}</string>
 											<reference key="NSSuperview" ref="726109125"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="212627618"/>
 											<string key="NSReuseIdentifierKey">_NS:1535</string>
 											<bool key="NSEnabled">YES</bool>
@@ -455,7 +446,8 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{17, 16}, {259, 11}}</string>
 											<reference key="NSSuperview" ref="726109125"/>
-											<reference key="NSNextKeyView" ref="166081160"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="894571713"/>
 											<string key="NSReuseIdentifierKey">_NS:1535</string>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="72260846">
@@ -470,8 +462,64 @@
 											</object>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
+										<object class="NSSecureTextField" id="685310174">
+											<reference key="NSNextResponder" ref="726109125"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{20, 179}, {214, 22}}</string>
+											<reference key="NSSuperview" ref="726109125"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="1035439471"/>
+											<string key="NSReuseIdentifierKey">_NS:9</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSSecureTextFieldCell" key="NSCell" id="95367784">
+												<int key="NSCellFlags">342884416</int>
+												<int key="NSCellFlags2">272630848</int>
+												<string key="NSContents"/>
+												<reference key="NSSupport" ref="308723166"/>
+												<string key="NSCellIdentifier">_NS:9</string>
+												<reference key="NSControlView" ref="685310174"/>
+												<bool key="NSDrawsBackground">YES</bool>
+												<reference key="NSBackgroundColor" ref="955209345"/>
+												<reference key="NSTextColor" ref="412903852"/>
+												<array key="NSAllowedInputLocales">
+													<string>NSAllRomanInputSourcesLocaleIdentifier</string>
+												</array>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSButton" id="1035439471">
+											<reference key="NSNextResponder" ref="726109125"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{242, 177}, {31, 25}}</string>
+											<reference key="NSSuperview" ref="726109125"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="172507372"/>
+											<string key="NSReuseIdentifierKey">_NS:22</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="559791256">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">134217728</int>
+												<string key="NSContents"/>
+												<reference key="NSSupport" ref="308723166"/>
+												<string key="NSCellIdentifier">_NS:22</string>
+												<reference key="NSControlView" ref="1035439471"/>
+												<int key="NSButtonFlags">-926662656</int>
+												<int key="NSButtonFlags2">163</int>
+												<object class="NSCustomResource" key="NSNormalImage">
+													<string key="NSClassName">NSImage</string>
+													<string key="NSResourceName">NSQuickLookTemplate</string>
+												</object>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">400</int>
+												<int key="NSPeriodicInterval">75</int>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
 									</array>
 									<string key="NSFrameSize">{293, 399}</string>
+									<reference key="NSSuperview" ref="166081160"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="734056912"/>
 									<string key="NSReuseIdentifierKey">_NS:11</string>
 								</object>
@@ -655,7 +703,7 @@
 							</object>
 							<object class="NSTabViewItem" id="201880332">
 								<object class="NSView" key="NSView" id="292493070">
-									<reference key="NSNextResponder" ref="166081160"/>
+									<nil key="NSNextResponder"/>
 									<int key="NSvFlags">256</int>
 									<array class="NSMutableArray" key="NSSubviews">
 										<object class="NSButton" id="394980328">
@@ -663,7 +711,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{241, 362}, {32, 19}}</string>
 											<reference key="NSSuperview" ref="292493070"/>
-											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="994354248"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<bool key="NSEnabled">YES</bool>
@@ -692,7 +739,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{17, 365}, {79, 14}}</string>
 											<reference key="NSSuperview" ref="292493070"/>
-											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="394980328"/>
 											<string key="NSReuseIdentifierKey">_NS:1535</string>
 											<bool key="NSEnabled">YES</bool>
@@ -722,7 +768,6 @@
 															<array class="NSMutableArray" key="NSSubviews"/>
 															<string key="NSFrameSize">{251, 332}</string>
 															<reference key="NSSuperview" ref="385885401"/>
-															<reference key="NSWindow"/>
 															<reference key="NSNextKeyView" ref="998331805"/>
 															<string key="NSReuseIdentifierKey">_NS:13</string>
 															<bool key="NSEnabled">YES</bool>
@@ -807,7 +852,6 @@
 													</array>
 													<string key="NSFrame">{{1, 1}, {251, 332}}</string>
 													<reference key="NSSuperview" ref="994354248"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="1017381471"/>
 													<string key="NSReuseIdentifierKey">_NS:11</string>
 													<reference key="NSDocView" ref="1017381471"/>
@@ -819,7 +863,6 @@
 													<int key="NSvFlags">-2147483392</int>
 													<string key="NSFrame">{{37, 1}, {16, 2}}</string>
 													<reference key="NSSuperview" ref="994354248"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="314808687"/>
 													<string key="NSReuseIdentifierKey">_NS:58</string>
 													<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -832,8 +875,6 @@
 													<int key="NSvFlags">-2147483392</int>
 													<string key="NSFrame">{{1, 147}, {52, 16}}</string>
 													<reference key="NSSuperview" ref="994354248"/>
-													<reference key="NSWindow"/>
-													<reference key="NSNextKeyView"/>
 													<string key="NSReuseIdentifierKey">_NS:60</string>
 													<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 													<int key="NSsFlags">1</int>
@@ -844,7 +885,6 @@
 											</array>
 											<string key="NSFrame">{{20, 20}, {253, 334}}</string>
 											<reference key="NSSuperview" ref="292493070"/>
-											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="385885401"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<int key="NSsFlags">133682</int>
@@ -858,8 +898,6 @@
 										</object>
 									</array>
 									<string key="NSFrameSize">{293, 399}</string>
-									<reference key="NSSuperview" ref="166081160"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="1028562761"/>
 								</object>
 								<string key="NSLabel">Attachments</string>
@@ -1045,13 +1083,13 @@
 								<reference key="NSTabView" ref="166081160"/>
 							</object>
 						</array>
-						<reference key="NSSelectedTabViewItem" ref="201880332"/>
+						<reference key="NSSelectedTabViewItem" ref="1002013291"/>
 						<reference key="NSFont" ref="308723166"/>
 						<int key="NSTvFlags">6</int>
 						<bool key="NSAllowTruncatedLabels">YES</bool>
 						<bool key="NSDrawsBackground">YES</bool>
 						<array class="NSMutableArray" key="NSSubviews">
-							<reference ref="292493070"/>
+							<reference ref="726109125"/>
 						</array>
 					</object>
 				</array>
@@ -1128,14 +1166,6 @@
 					</object>
 					<int key="connectionID">1287</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">passwordTextField</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="25956638"/>
-					</object>
-					<int key="connectionID">1284</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">_popUpPasswordGenerator:</string>
@@ -1232,6 +1262,22 @@
 					</object>
 					<int key="connectionID">2244</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">passwordTextField</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="685310174"/>
+					</object>
+					<int key="connectionID">2279</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">togglePassword</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="1035439471"/>
+					</object>
+					<int key="connectionID">2280</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">imageView</string>
@@ -2198,6 +2244,70 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
+							<object class="IBNSLayoutConstraint" id="849686715">
+								<reference key="firstItem" ref="1035439471"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="685310174"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="726109125"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1048935945">
+								<reference key="firstItem" ref="726109125"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1035439471"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="726109125"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="319543535">
+								<reference key="firstItem" ref="172507372"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1035439471"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="726109125"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="404436173">
+								<reference key="firstItem" ref="172507372"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="685310174"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="726109125"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="806657697">
 								<reference key="firstItem" ref="726109125"/>
 								<int key="firstAttribute">6</int>
@@ -2214,22 +2324,6 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="574256349">
-								<reference key="firstItem" ref="172507372"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="25956638"/>
-								<int key="secondAttribute">4</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">8</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="726109125"/>
-								<int key="scoringType">9</int>
-								<float key="scoringTypeFloat">40</float>
-								<int key="contentType">3</int>
-							</object>
 							<object class="IBNSLayoutConstraint" id="833009099">
 								<reference key="firstItem" ref="172507372"/>
 								<int key="firstAttribute">5</int>
@@ -2246,40 +2340,8 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="1048935945">
-								<reference key="firstItem" ref="726109125"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="25956638"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="726109125"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="700884070">
-								<reference key="firstItem" ref="25956638"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="279643156"/>
-								<int key="secondAttribute">4</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">8</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="726109125"/>
-								<int key="scoringType">9</int>
-								<float key="scoringTypeFloat">40</float>
-								<int key="contentType">3</int>
-							</object>
 							<object class="IBNSLayoutConstraint" id="928232729">
-								<reference key="firstItem" ref="25956638"/>
+								<reference key="firstItem" ref="685310174"/>
 								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="726109125"/>
@@ -2294,6 +2356,22 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
+							<object class="IBNSLayoutConstraint" id="114341993">
+								<reference key="firstItem" ref="685310174"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="279643156"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="726109125"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="502895567">
 								<reference key="firstItem" ref="279643156"/>
 								<int key="firstAttribute">3</int>
@@ -2589,10 +2667,11 @@
 							<reference ref="428053603"/>
 							<reference ref="484293743"/>
 							<reference ref="279643156"/>
-							<reference ref="25956638"/>
 							<reference ref="172507372"/>
 							<reference ref="13391205"/>
 							<reference ref="212627618"/>
+							<reference ref="1035439471"/>
+							<reference ref="685310174"/>
 						</array>
 						<reference key="parent" ref="1002013291"/>
 					</object>
@@ -2687,19 +2766,6 @@
 						<reference key="object" ref="265601258"/>
 						<reference key="parent" ref="279643156"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1232</int>
-						<reference key="object" ref="25956638"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="255014572"/>
-						</array>
-						<reference key="parent" ref="726109125"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1273</int>
-						<reference key="object" ref="255014572"/>
-						<reference key="parent" ref="25956638"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">1231</int>
 						<reference key="object" ref="172507372"/>
@@ -2823,11 +2889,6 @@
 						<reference key="object" ref="902687269"/>
 						<reference key="parent" ref="726109125"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1672</int>
-						<reference key="object" ref="928232729"/>
-						<reference key="parent" ref="726109125"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">1697</int>
 						<reference key="object" ref="644631459"/>
@@ -2903,16 +2964,6 @@
 						<reference key="object" ref="502895567"/>
 						<reference key="parent" ref="726109125"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1901</int>
-						<reference key="object" ref="700884070"/>
-						<reference key="parent" ref="726109125"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1903</int>
-						<reference key="object" ref="574256349"/>
-						<reference key="parent" ref="726109125"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">1884</int>
 						<reference key="object" ref="13391205"/>
@@ -3932,11 +3983,6 @@
 						<reference key="object" ref="118043141"/>
 						<reference key="parent" ref="726109125"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2082</int>
-						<reference key="object" ref="1048935945"/>
-						<reference key="parent" ref="726109125"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">2083</int>
 						<reference key="object" ref="806657697"/>
@@ -4442,6 +4488,62 @@
 						<reference key="object" ref="334071022"/>
 						<reference key="parent" ref="421971283"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2263</int>
+						<reference key="object" ref="685310174"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="95367784"/>
+						</array>
+						<reference key="parent" ref="726109125"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2264</int>
+						<reference key="object" ref="95367784"/>
+						<reference key="parent" ref="685310174"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2266</int>
+						<reference key="object" ref="114341993"/>
+						<reference key="parent" ref="726109125"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2267</int>
+						<reference key="object" ref="404436173"/>
+						<reference key="parent" ref="726109125"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2268</int>
+						<reference key="object" ref="928232729"/>
+						<reference key="parent" ref="726109125"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2273</int>
+						<reference key="object" ref="1035439471"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="559791256"/>
+						</array>
+						<reference key="parent" ref="726109125"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2274</int>
+						<reference key="object" ref="559791256"/>
+						<reference key="parent" ref="1035439471"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2275</int>
+						<reference key="object" ref="1048935945"/>
+						<reference key="parent" ref="726109125"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2276</int>
+						<reference key="object" ref="319543535"/>
+						<reference key="parent" ref="726109125"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2278</int>
+						<reference key="object" ref="849686715"/>
+						<reference key="parent" ref="726109125"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -4453,8 +4555,6 @@
 				<string key="101.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="1231.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="1231.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="1232.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="1232.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="1233.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="1233.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1234.CustomClassName">HNHRoundedTextField</string>
@@ -4480,8 +4580,6 @@
 				<string key="1271.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1272.CustomClassName">HNHRoundedTextFieldCell</string>
 				<string key="1272.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1273.CustomClassName">HNHRoundedSecureTextFieldCell</string>
-				<string key="1273.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1274.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1349.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="1352.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
@@ -4502,7 +4600,7 @@
 					<reference ref="171913043"/>
 				</array>
 				<string key="1396.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array class="NSMutableArray" key="1397.IBNSViewMetadataConstraints">
+				<array key="1397.IBNSViewMetadataConstraints">
 					<reference ref="866470549"/>
 					<reference ref="496215318"/>
 					<reference ref="644631459"/>
@@ -4521,12 +4619,14 @@
 					<reference ref="118043141"/>
 					<reference ref="1058462363"/>
 					<reference ref="502895567"/>
+					<reference ref="114341993"/>
 					<reference ref="928232729"/>
-					<reference ref="700884070"/>
-					<reference ref="1048935945"/>
 					<reference ref="833009099"/>
-					<reference ref="574256349"/>
 					<reference ref="806657697"/>
+					<reference ref="404436173"/>
+					<reference ref="319543535"/>
+					<reference ref="1048935945"/>
+					<reference ref="849686715"/>
 					<reference ref="989194529"/>
 					<reference ref="400643134"/>
 					<reference ref="19592612"/>
@@ -4608,7 +4708,6 @@
 				<string key="1580.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1581.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1665.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1672.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1697.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1705.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1720.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4627,8 +4726,6 @@
 				<string key="1885.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1898.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1900.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1901.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1903.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1910.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="1929.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="1929.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4727,7 +4824,6 @@
 				<string key="2074.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2078.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2080.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="2082.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2083.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2086.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2087.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4811,6 +4907,19 @@
 				<string key="2255.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2256.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2258.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2263.CustomClassName">HNHRoundedSecureTextField</string>
+				<boolean value="NO" key="2263.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="2263.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2264.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2266.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2267.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2268.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="2273.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="2273.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2274.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2275.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2276.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2278.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<array key="455.IBNSViewMetadataConstraints">
 					<reference ref="222939184"/>
 					<reference ref="1058743908"/>
@@ -4857,7 +4966,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">2261</int>
+			<int key="maxID">2280</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -4870,11 +4979,22 @@
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">HNHRoundedSecureTextFieldCell</string>
-					<string key="superclassName">NSTextFieldCell</string>
+					<string key="className">HNHRoundedSecureTextField</string>
+					<string key="superclassName">NSSecureTextField</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">toggleDisplay:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">toggleDisplay:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">toggleDisplay:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/HNHRoundedSecureTextFieldCell.h</string>
+						<string key="minorKey">./Classes/HNHRoundedSecureTextField.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -4973,10 +5093,11 @@
 						<string key="itemNameTextfield">NSTextField</string>
 						<string key="modifiedTextField">NSTextField</string>
 						<string key="notesTextView">NSTextView</string>
-						<string key="passwordTextField">NSTextField</string>
+						<string key="passwordTextField">HNHRoundedSecureTextField</string>
 						<string key="tabView">NSTabView</string>
 						<string key="titleOrNameLabel">NSTextField</string>
 						<string key="titleTextField">NSTextField</string>
+						<string key="togglePassword">NSButton</string>
 						<string key="usernameTextField">NSTextField</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -5030,7 +5151,7 @@
 						</object>
 						<object class="IBToOneOutletInfo" key="passwordTextField">
 							<string key="name">passwordTextField</string>
-							<string key="candidateClassName">NSTextField</string>
+							<string key="candidateClassName">HNHRoundedSecureTextField</string>
 						</object>
 						<object class="IBToOneOutletInfo" key="tabView">
 							<string key="name">tabView</string>
@@ -5044,6 +5165,10 @@
 							<string key="name">titleTextField</string>
 							<string key="candidateClassName">NSTextField</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="togglePassword">
+							<string key="name">togglePassword</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="usernameTextField">
 							<string key="name">usernameTextField</string>
 							<string key="candidateClassName">NSTextField</string>
@@ -5114,6 +5239,7 @@
 			<string key="NSActionTemplate">{15, 15}</string>
 			<string key="NSAddTemplate">{8, 8}</string>
 			<string key="NSApplicationIcon">{128, 128}</string>
+			<string key="NSQuickLookTemplate">{21, 16}</string>
 			<string key="NSRemoveTemplate">{8, 8}</string>
 			<string key="NSSmartBadgeTemplate">{15, 15}</string>
 		</dictionary>
diff --git a/MacPass/Base.lproj/PasswordInputView.xib b/MacPass/Base.lproj/PasswordInputView.xib
index b018a6eb..3e034fd0 100644
--- a/MacPass/Base.lproj/PasswordInputView.xib
+++ b/MacPass/Base.lproj/PasswordInputView.xib
@@ -95,7 +95,7 @@
 							<reference key="NSSupport" ref="786940182"/>
 							<string key="NSCellIdentifier">_NS:22</string>
 							<reference key="NSControlView" ref="145392176"/>
-							<int key="NSButtonFlags">-1228652544</int>
+							<int key="NSButtonFlags">-926662656</int>
 							<int key="NSButtonFlags2">163</int>
 							<object class="NSCustomResource" key="NSNormalImage">
 								<string key="NSClassName">NSImage</string>
@@ -606,6 +606,38 @@
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
+							<object class="IBNSLayoutConstraint" id="46265369">
+								<reference key="firstItem" ref="660673733"/>
+								<int key="firstAttribute">9</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="843649698"/>
+								<int key="secondAttribute">9</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1005"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="660462739">
+								<reference key="firstItem" ref="660673733"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="204058255"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1005"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="720709266">
 								<reference key="firstItem" ref="1034097047"/>
 								<int key="firstAttribute">3</int>
@@ -654,38 +686,6 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="46265369">
-								<reference key="firstItem" ref="660673733"/>
-								<int key="firstAttribute">9</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="843649698"/>
-								<int key="secondAttribute">9</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="1005"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">2</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="660462739">
-								<reference key="firstItem" ref="660673733"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="204058255"/>
-								<int key="secondAttribute">4</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">8</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="1005"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">3</int>
-							</object>
 							<object class="IBNSLayoutConstraint" id="827553010">
 								<reference key="firstItem" ref="843649698"/>
 								<int key="firstAttribute">5</int>
@@ -1119,11 +1119,11 @@
 					<reference ref="272604804"/>
 					<reference ref="240000218"/>
 					<reference ref="827553010"/>
-					<reference ref="660462739"/>
-					<reference ref="46265369"/>
 					<reference ref="98930949"/>
 					<reference ref="292242157"/>
 					<reference ref="720709266"/>
+					<reference ref="660462739"/>
+					<reference ref="46265369"/>
 					<reference ref="273022298"/>
 					<reference ref="912203343"/>
 					<reference ref="1001566026"/>
diff --git a/MacPass/DatabaseSettingsWindow.xib b/MacPass/DatabaseSettingsWindow.xib
index 638312ed..aa021f30 100644
--- a/MacPass/DatabaseSettingsWindow.xib
+++ b/MacPass/DatabaseSettingsWindow.xib
@@ -71,7 +71,6 @@
 							<string key="NSFrame">{{384, 13}, {69, 32}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView"/>
 							<string key="NSReuseIdentifierKey">_NS:9</string>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="800358251">
@@ -428,7 +427,6 @@
 												<string key="NSFrame">{{142, 69}, {164, 19}}</string>
 												<reference key="NSSuperview" ref="830804879"/>
 												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView" ref="115846238"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="861795155">
@@ -467,7 +465,7 @@
 													<reference key="NSSupport" ref="481048132"/>
 													<string key="NSCellIdentifier">_NS:22</string>
 													<reference key="NSControlView" ref="548323424"/>
-													<int key="NSButtonFlags">-1228652544</int>
+													<int key="NSButtonFlags">-926662656</int>
 													<int key="NSButtonFlags2">163</int>
 													<object class="NSCustomResource" key="NSNormalImage">
 														<string key="NSClassName">NSImage</string>
@@ -2825,12 +2823,12 @@
 								<int key="contentType">3</int>
 							</object>
 							<reference ref="156220187"/>
-							<reference ref="548323424"/>
 							<reference ref="562503982"/>
 							<reference ref="323392534"/>
 							<reference ref="118397594"/>
 							<reference ref="484114537"/>
 							<reference ref="2005807"/>
+							<reference ref="548323424"/>
 						</array>
 						<reference key="parent" ref="961038136"/>
 					</object>
diff --git a/MacPass/MPInspectorViewController.h b/MacPass/MPInspectorViewController.h
index 33215c5b..3ca51dbe 100644
--- a/MacPass/MPInspectorViewController.h
+++ b/MacPass/MPInspectorViewController.h
@@ -12,6 +12,7 @@
 @class KdbEntry;
 @class KdbGroup;
 @class HNHGradientView;
+@class HNHRoundedSecureTextField;
 @class MPDocumentWindowController;
 
 @interface MPInspectorViewController : MPViewController <NSPopoverDelegate, NSTableViewDelegate>
@@ -22,7 +23,7 @@
 @property (weak) IBOutlet NSTextField *titleTextField;
 @property (weak) IBOutlet NSTextField *usernameTextField;
 @property (weak) IBOutlet NSTextField *URLTextField;
-@property (weak) IBOutlet NSTextField *passwordTextField;
+@property (weak) IBOutlet HNHRoundedSecureTextField *passwordTextField;
 @property (weak) IBOutlet NSTextField *titleOrNameLabel;
 @property (weak) IBOutlet HNHGradientView *bottomBar;
 @property (weak) IBOutlet NSTextField *createdTextField;
@@ -32,6 +33,7 @@
 @property (weak) IBOutlet NSTableView *customFieldsTableView;
 @property (unsafe_unretained) IBOutlet NSTextView *notesTextView;
 @property (weak) IBOutlet NSTextField *customFieldsTextField;
+@property (weak) IBOutlet NSButton *togglePassword;
 
 
 /* Seperate call to ensure alle registered objects are in place */
diff --git a/MacPass/MPInspectorViewController.m b/MacPass/MPInspectorViewController.m
index 8a88f51c..c41a398d 100644
--- a/MacPass/MPInspectorViewController.m
+++ b/MacPass/MPInspectorViewController.m
@@ -32,6 +32,7 @@
 
 #import "HNHGradientView.h"
 #import "HNHTableRowView.h"
+#import "HNHRoundedSecureTextField.h"
 
 enum {
   MPGeneralTab,
@@ -53,6 +54,8 @@ enum {
 @property (nonatomic, weak) NSDate *modificationDate;
 @property (nonatomic, weak) NSDate *creationDate;
 
+@property (nonatomic, assign) BOOL showPassword;
+
 @property (nonatomic, assign) NSUInteger activeTab;
 @property (weak) IBOutlet NSTabView *tabView;
 @property (strong) NSArrayController *attachmentsController;
@@ -75,6 +78,7 @@ enum {
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
   self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
   if (self) {
+    _showPassword = NO;
     _selectedEntry = nil;
     _selectedGroup = nil;
     _attachmentsController = [[NSArrayController alloc] init];
@@ -106,6 +110,9 @@ enum {
   [_customFieldsTableView bind:NSContentBinding toObject:self.customFieldsController withKeyPath:@"arrangedObjects" options:nil];
   [_customFieldsTableView setDelegate:self];
   
+  [self.passwordTextField bind:@"showPassword" toObject:self withKeyPath:@"showPassword" options:nil];
+  [self.togglePassword bind:NSValueBinding toObject:self withKeyPath:@"showPassword" options:nil];
+  
   [self _clearContent];
 }
 
@@ -255,6 +262,7 @@ enum {
   
   enabled &= (self.selectedEntry != nil);
   [self.passwordTextField setEnabled:enabled];
+  [self.togglePassword setEnabled:enabled];
   [self.usernameTextField setEnabled:enabled];
   [self.URLTextField setEnabled:enabled];
   [self.generatePasswordButton setEnabled:enabled];
diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist
index af1bf220..e28404f1 100644
--- a/MacPass/MacPass-Info.plist
+++ b/MacPass/MacPass-Info.plist
@@ -48,7 +48,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2288</string>
+	<string>2301</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>