diff --git a/boring-nginx/ngxpasswd b/boring-nginx/ngxpasswd
index f865c91..70e5bf6 100644
--- a/boring-nginx/ngxpasswd
+++ b/boring-nginx/ngxpasswd
@@ -9,12 +9,13 @@ cd /passwds || exit 1
 
 while [ "$NAME" == "" ]; do
     read -p "Name: " NAME
-    if [ -f "/passwds/$NAME.htpasswd" ]; then
-        echo "ERROR: /passwds/$NAME.htpasswd already exists."
-        exit 1
-    fi
 done
 
+if [ -f "/passwds/$NAME.htpasswd" ]; then
+    echo "ERROR: /passwds/$NAME.htpasswd already exists."
+    exit 1
+fi
+
 while [ "$USER" == "" ]; do
     read -p "User: " USER
 done
@@ -24,6 +25,8 @@ read -p "Password (leave blank to generate one): " PASSWORD
 if [ "$PASSWORD" == "" ]; then
     echo "Password was not defined, generating a random one..."
     PASSWORD=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 20 | head -n 1)
+elif [ ${#PASSWORD} -le 6 ]; then
+    echo "WARNING: Non-secure password."
 fi
 
 echo -n $USER:$(openssl passwd -apr1 $PASSWORD) >> $NAME.htpasswd