diff --git a/keepercommander/commands/record_edit.py b/keepercommander/commands/record_edit.py
index 87676deff..63c9ab4e7 100644
--- a/keepercommander/commands/record_edit.py
+++ b/keepercommander/commands/record_edit.py
@@ -183,8 +183,10 @@
 Value                   Field type         Description                      Example
 ====================    ===============    ===================              ==============
 $GEN:[alg],[n]          password           Generates a random password      $GEN:dice,5
-                                           Default algorith is rand         alg: [rand | dice | crypto]
-                                           Optional: password length
+                                           Default algorithm is rand        alg: [rand | dice | crypto]
+                                           Optional: length (min 8)        $GEN or $GEN:rand,24
+                                           Includes upper, lower,
+                                           digits, and symbols
 $GEN                    oneTimeCode        Generates TOTP URL
 $GEN:[alg,][enc]        keyPair            Generates a key pair and         $GEN:ec,enc
                                            optional passcode                alg: [rsa | ec | ed25519], enc
@@ -205,8 +207,8 @@
 pam config new --environment=local --title=config1 --gateway=gateway1 -sf=SHARED_FOLDER_UID \
     --connections=on --tunneling=on --rotation=on --remote-browser-isolation=on
 
-record-add --folder=SHARED_FOLDER_UID --title=admin1 -rt=pamUser login=admin1 password="$GEN:rand,16"
-record-add --folder=SHARED_FOLDER_UID --title=user1  -rt=pamUser login=user1  password="$GEN:rand,16"
+record-add --folder=SHARED_FOLDER_UID --title=admin1 -rt=pamUser login=admin1 password="$GEN"
+record-add --folder=SHARED_FOLDER_UID --title=user1  -rt=pamUser login=user1  password="$GEN"
 record-add --folder=SHARED_FOLDER_UID --title=machine1 -rt=pamMachine \
   pamHostname="$JSON:{\"hostName\": \"127.0.0.1\", \"port\": \"22\"}"
 
@@ -416,8 +418,9 @@ def generate_password(parameters=None):   # type: (Optional[Sequence[str]]) -> s
             gen = generator.DicewarePasswordGenerator(length)
         else:
             if isinstance(length, int):
-                if length < 4:
-                    length = 4
+                if length < 8:
+                    logging.warning('Password length %d is below minimum 8. Using 8.', length)
+                    length = 8
                 elif length > 200:
                     length = 200
             else: