diff --git a/client/ssh/client/client_test.go b/client/ssh/client/client_test.go
index d00643add..77be622ec 100644
--- a/client/ssh/client/client_test.go
+++ b/client/ssh/client/client_test.go
@@ -448,11 +448,8 @@ func TestSSHClient_PortForwardingDataTransfer(t *testing.T) {
 func getCurrentUsername() string {
 	if runtime.GOOS == "windows" {
 		if currentUser, err := user.Current(); err == nil {
-			username := currentUser.Username
-			if idx := strings.LastIndex(username, "\\"); idx != -1 {
-				username = username[idx+1:]
-			}
-			return strings.ToLower(username)
+			// On Windows, return the full domain\username for proper authentication
+			return currentUser.Username
 		}
 	}
 
diff --git a/client/ssh/server/executor_windows.go b/client/ssh/server/executor_windows.go
index 0a34d9ca9..8a937b821 100644
--- a/client/ssh/server/executor_windows.go
+++ b/client/ssh/server/executor_windows.go
@@ -430,7 +430,6 @@ func (pd *PrivilegeDropper) isLocalUser(domain string) bool {
 	}
 
 	return domain == "" || domain == "." ||
-		strings.EqualFold(domain, "localhost") ||
 		strings.EqualFold(domain, hostname)
 }