diff --git a/command/ssh/ssh.go b/command/ssh/ssh.go
index 699c11ca6..ae0bb5eea 100644
--- a/command/ssh/ssh.go
+++ b/command/ssh/ssh.go
@@ -272,6 +272,9 @@ func createPrincipalsFromSubject(subject string) []string {
 		if local := subject[:i]; !strings.EqualFold(local, name) {
 			principals = append(principals, local)
 		}
+	}
+	// Append the original subject if different.
+	if subject != name {
 		principals = append(principals, subject)
 	}
 	return principals