diff --git a/infrastructure_files/base.setup.env b/infrastructure_files/base.setup.env
index 226d94151..2d74e3a66 100644
--- a/infrastructure_files/base.setup.env
+++ b/infrastructure_files/base.setup.env
@@ -60,3 +60,5 @@ export MGMT_VOLUMESUFFIX
 export SIGNAL_VOLUMESUFFIX
 export LETSENCRYPT_VOLUMESUFFIX
 export NETBIRD_DISABLE_ANONYMOUS_METRICS
+export NETBIRD_MGMT_SINGLE_ACCOUNT_MODE_DOMAIN
+export NETBIRD_MGMT_DNS_DOMAIN
\ No newline at end of file
diff --git a/management/server/peer.go b/management/server/peer.go
index 8793d4301..1e4bbd4f2 100644
--- a/management/server/peer.go
+++ b/management/server/peer.go
@@ -85,7 +85,7 @@ func (p *Peer) FQDN(dnsDomain string) string {
 
 // EventMeta returns activity event meta related to the peer
 func (p *Peer) EventMeta(dnsDomain string) map[string]any {
-	return map[string]any{"name": p.Name, "dns": p.FQDN(dnsDomain), "ip": p.IP}
+	return map[string]any{"name": p.Name, "fqdn": p.FQDN(dnsDomain), "ip": p.IP}
 }
 
 // Copy PeerStatus
@@ -367,7 +367,6 @@ func (am *DefaultAccountManager) AddPeer(setupKey, userID string, peer *Peer) (*
 	var account *Account
 	var err error
 	addedByUser := false
-
 	if len(userID) > 0 {
 		addedByUser = true
 		account, err = am.Store.GetAccountByUser(userID)