diff --git a/management/server/http/api/openapi.yml b/management/server/http/api/openapi.yml
index f886ccd32..c4beb5455 100644
--- a/management/server/http/api/openapi.yml
+++ b/management/server/http/api/openapi.yml
@@ -110,6 +110,15 @@ components:
             ssh_enabled:
               description: Indicates whether SSH server is enabled on this peer
               type: boolean
+            user_email:
+              description: User Email that this peer was added by
+              type: string
+            user_name:
+              description: User full name that this peer was added by
+              type: string
+            host_name:
+              description: Peer's hostname
+              type: string
           required:
           - ip
           - connected
diff --git a/management/server/http/api/types.gen.go b/management/server/http/api/types.gen.go
index 7a3b6ae5e..dc251ec87 100644
--- a/management/server/http/api/types.gen.go
+++ b/management/server/http/api/types.gen.go
@@ -137,6 +137,9 @@ type Peer struct {
 	// Groups that the peer belongs to
 	Groups []GroupMinimum `json:"groups"`
 
+	// Peer's hostname
+	HostName *string `json:"host_name,omitempty"`
+
 	// Peer ID
 	Id string `json:"id"`
 
@@ -155,6 +158,12 @@ type Peer struct {
 	// Indicates whether SSH server is enabled on this peer
 	SshEnabled bool `json:"ssh_enabled"`
 
+	// User Email that this peer was added by
+	UserEmail *string `json:"user_email,omitempty"`
+
+	// User full name that this peer was added by
+	UserName *string `json:"user_name,omitempty"`
+
 	// Peer's daemon or cli version
 	Version string `json:"version"`
 }
diff --git a/management/server/http/peers.go b/management/server/http/peers.go
index c49a35e04..63e728552 100644
--- a/management/server/http/peers.go
+++ b/management/server/http/peers.go
@@ -141,7 +141,7 @@ func toPeerResponse(peer *server.PeerInfo, account *server.Account) *api.Peer {
 			}
 		}
 	}
-	return &api.Peer{
+	resp := &api.Peer{
 		Id:         peer.Peer.IP.String(),
 		Name:       peer.Peer.Name,
 		Ip:         peer.Peer.IP.String(),
@@ -151,5 +151,13 @@ func toPeerResponse(peer *server.PeerInfo, account *server.Account) *api.Peer {
 		Version:    peer.Peer.Meta.WtVersion,
 		Groups:     groupsInfo,
 		SshEnabled: peer.Peer.SSHEnabled,
+		HostName:   &peer.Peer.Meta.Hostname,
 	}
+
+	if peer.UserInfo != nil {
+		resp.UserEmail = &peer.UserInfo.Email
+		resp.UserName = &peer.UserInfo.Name
+	}
+
+	return resp
 }