diff --git a/managed/services/management/agent.go b/managed/services/management/agent.go
index 73e10a1339..d8105ff1b5 100644
--- a/managed/services/management/agent.go
+++ b/managed/services/management/agent.go
@@ -150,9 +150,9 @@ func (s *AgentService) agentToAPI(agent *models.Agent) (*agentv1beta1.UniversalA
 		Disabled:                       agent.Disabled,
 		DisabledCollectors:             agent.DisabledCollectors,
 		IsConnected:                    s.r.IsConnected(agent.AgentID),
-		IsAgentPasswordSet:             decryptedPassword != "",
+		IsAgentPasswordSet:             agent.AgentPassword != nil,
 		IsAwsSecretKeySet:              agent.AWSSecretKey != nil,
-		IsPasswordSet:                  agent.Password != nil,
+		IsPasswordSet:                  decryptedPassword != "",
 		ListenPort:                     uint32(pointer.GetUint16(agent.ListenPort)),
 		LogLevel:                       pointer.GetString(agent.LogLevel),
 		MaxQueryLength:                 agent.MaxQueryLength,