diff --git a/xCAT-server/lib/xcat/plugins/xdsh.pm b/xCAT-server/lib/xcat/plugins/xdsh.pm
index 14b780e97..67eabbfd4 100644
--- a/xCAT-server/lib/xcat/plugins/xdsh.pm
+++ b/xCAT-server/lib/xcat/plugins/xdsh.pm
@@ -529,6 +529,11 @@ sub process_request
         my ($var, $value) = split(/=/, $envar, 2);
         $ENV{$var} = $value;
     }
+    # if request->{username} exists,  set DSH_FROM_USERID to it
+    # override input,  this is what was authenticated
+    if (($request->{username}) && defined($request->{username}->[0])) {
+       $ENV{DSH_FROM_USERID} = $request->{username}->[0];
+    } 
     if ($command eq "xdsh")
     {
         xdsh($nodes, $args, $callback, $command, $request->{noderange}->[0]);