diff --git a/perl-xCAT/xCAT/DSHCLI.pm b/perl-xCAT/xCAT/DSHCLI.pm
index 0c98e7908..8121f475d 100644
--- a/perl-xCAT/xCAT/DSHCLI.pm
+++ b/perl-xCAT/xCAT/DSHCLI.pm
@@ -980,8 +980,8 @@ sub fork_fanout_dsh
       = @_;
 
     #get username and passeword for switches 
-    if (($$options{'devicetype'} =~ /EthSwitch/) {
-        ($$options{'devicetype'} =~ /IBSwitch/) ){
+    if (($$options{'devicetype'} =~ /EthSwitch/) || 
+        (($$options{'devicetype'} =~ /IBSwitch/) && !($$options{'user'})) ){
         if (@$targets_waiting > 0) {
             if ($ENV{'DSH_REMOTE_PASSWORD'}) {
                 foreach my $t (keys(%$resolved_targets)) {