diff --git a/netboot.sh b/netboot.sh
index 8af70b0..86520f3 100644
--- a/netboot.sh
+++ b/netboot.sh
@@ -150,11 +150,13 @@ else
   fi
 fi
 
-if [ -z "$PASSWD" ] && [ "$MANUALLY" != true ]; then
+if [ "$MANUALLY" != true ]; then
+if [ -z "$PASSWD" ]; then
   PASSWD=$(mkpasswd -m sha-512)
 else
   PASSWD=$(mkpasswd -m sha-512 "$PASSWD")
 fi
+fi
 
 
 if [ "$DRYRUN" != true ]; then