diff --git a/netboot.sh b/netboot.sh
index 20086a2..4cecae4 100644
--- a/netboot.sh
+++ b/netboot.sh
@@ -100,12 +100,6 @@ NTPSERVER=${NTPSERVER:-pool.ntp.org}
 UPGRADE=${UPGRADE:-full-upgrade}
 LINKED=${LINKED:-false}
 
-if [ -z "$PASSWORD" ]; then
-  PASSWORD=$(mkpasswd -m sha-512)
-else
-  PASSWORD=$(mkpasswd -m sha-512 "$PASSWORD")
-fi
-
 if [ -z "$SECURITY" ]; then
   if $LINKED; then
     SECURITY=$TRANSPORT://$MIRROR${DIRECTORY%/*}/debian-security
@@ -114,6 +108,12 @@ if [ -z "$SECURITY" ]; then
   fi
 fi
 
+if [ -z "$PASSWORD" ]; then
+  PASSWORD=$(mkpasswd -m sha-512)
+else
+  PASSWORD=$(mkpasswd -m sha-512 "$PASSWORD")
+fi
+
 BOOT=/boot/debian-$SUITE
 URL=$TRANSPORT://$MIRROR$DIRECTORY/dists/$SUITE/main/installer-$ARCH/current/images/netboot/debian-installer/$ARCH