diff --git a/client/ssh/server/session_handlers.go b/client/ssh/server/session_handlers.go
index 0e531bb96..964a7d938 100644
--- a/client/ssh/server/session_handlers.go
+++ b/client/ssh/server/session_handlers.go
@@ -119,8 +119,12 @@ func (s *Server) handlePrivError(logger *log.Entry, session ssh.Session, err err
 // buildUserLookupErrorMessage creates appropriate user-facing error messages based on error type
 func (s *Server) buildUserLookupErrorMessage(err error) string {
 	var privilegedErr *PrivilegedUserError
+	var notFoundErr *UserNotFoundError
 
 	switch {
+	case errors.As(err, &notFoundErr):
+		return fmt.Sprintf("user %q does not exist on this host\n", notFoundErr.Username)
+
 	case errors.As(err, &privilegedErr):
 		if privilegedErr.Username == "root" {
 			return "root login is disabled on this SSH server\n"