diff --git a/xCAT-nbroot2/bmcsetup b/xCAT-nbroot2/bmcsetup
index 8ec66f424..36ae06423 100755
--- a/xCAT-nbroot2/bmcsetup
+++ b/xCAT-nbroot2/bmcsetup
@@ -157,6 +157,7 @@ fi
 
 let idev=NUMBMCS-1
 for bmcu in $BMCUS; do
+    if [ "$bmcu" = "" ]; then continue; fi
 DISABLEUSERS="1 2 3 4"
 if [ ! -z "$LOCKEDUSERS" ]; then
     USERSLOT=`ipmitool -d $idev user list $LANCHAN |grep -v ^ID|awk '{print $1 " " $2}'|grep " $BMCUS"|awk '{print $1}'`
@@ -218,6 +219,7 @@ let idev=idev-1
 done
 let idev=NUMBMCS-1
 for bmcp in $BMCPW; do
+    if [ "$bmcp" = "" ]; then continue; fi
 TRIES=0
 while ! ipmitool -d $idev user set password $USERSLOT $bmcp; do
     sleep 1