diff --git a/MacPass/Base.lproj/PasswordCreatorView.xib b/MacPass/Base.lproj/PasswordCreatorView.xib
index ad73285e..7861b012 100644
--- a/MacPass/Base.lproj/PasswordCreatorView.xib
+++ b/MacPass/Base.lproj/PasswordCreatorView.xib
@@ -144,6 +144,9 @@
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
                                     <font key="font" metaFont="cellTitle"/>
                                 </buttonCell>
+                                <connections>
+                                    <action selector="_toggleCharacters:" target="-2" id="5CP-8c-RKX"/>
+                                </connections>
                             </button>
                         </subviews>
                         <animations/>
diff --git a/MacPass/NSString+MPPasswordCreation.m b/MacPass/NSString+MPPasswordCreation.m
index 1ab8c9c0..ad09ebfc 100644
--- a/MacPass/NSString+MPPasswordCreation.m
+++ b/MacPass/NSString+MPPasswordCreation.m
@@ -106,13 +106,13 @@ static NSString *mergeWithoutDuplicates(NSString* baseCharacters, NSString* cust
 
 - (CGFloat)entropyWhithPossibleCharacterSet:(MPPasswordCharacterFlags)allowedCharacters orCustomCharacters:(NSString *)customCharacters {
   NSString *characters = nil;
-  if(nil == customCharacters) {
-    characters = allowedCharactersString(allowedCharacters);
+  if([[NSUserDefaults standardUserDefaults] boolForKey:kMPSettingsKeyPasswordUseCustomString] && nil != customCharacters) {
+    characters = mergeWithoutDuplicates(
+                                        allowedCharactersString(allowedCharacters),
+                                        customCharacters);
   }
   else {
-    NSString *characters = mergeWithoutDuplicates(
-                                                  allowedCharactersString(allowedCharacters),
-                                                  customCharacters);
+    characters = allowedCharactersString(allowedCharacters);
   }
   CGFloat alphabetCount = characters.length;
   CGFloat passwordLength = self.length;