diff --git a/sshpiperd/upstream/yaml/yaml.go b/sshpiperd/upstream/yaml/yaml.go
index 1d6b7430..00b7a4fc 100644
--- a/sshpiperd/upstream/yaml/yaml.go
+++ b/sshpiperd/upstream/yaml/yaml.go
@@ -359,7 +359,7 @@ func (p *plugin) findUpstream(conn ssh.ConnMetadata, challengeContext ssh.Additi
 
 		if matched {
 
-			p.logger.Printf("mapping [%v] to [%v]", user, pipe.Username)
+			p.logger.Printf("mapping [%v] to [%v@%v]", user, pipe.Authmap.MappedUsername, pipe.UpstreamHost)
 
 			c, err := upstream.DialForSSH(pipe.UpstreamHost)
 			if err != nil {